vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
15029 commits 1 branch 0 tags 587 MiB
Commit graph

15029 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
3679fb3464
Merge branch 'hotfix' 2018-06-22 05:08:14 +00:00
Ameya Shenoy
a8172434de bumped to version 10.1.37 2018-06-22 05:08:14 +00:00
Ameya Shenoy
da53a30b9e
minor fix 2018-06-21 18:38:28 +05:30
Ameya Shenoy
e6f3b5d8ac
Merge pull request #5705 from codingCoffee/mariadb_10_3 
[fix] for mariadb version 10.3
 2018-06-21 16:57:21 +05:30
Ameya Shenoy
6c02aaf16c [fix] for mariadb version 10.3 2018-06-21 15:01:42 +05:30
Ameya Shenoy
e4cc316bad
Merge pull request #5672 from codingCoffee/newap 
new app creation fix
 2018-06-10 20:47:21 +05:30
Ameya Shenoy
becb347d1f
new app creation fix 2018-06-10 06:47:30 +00:00
Saurabh
dd2c33e34a Merge branch 'hotfix' 2018-06-05 15:12:57 +05:30
Saurabh
8d0b33c5ca bumped to version 10.1.36 2018-06-05 15:42:57 +06:00
Faris Ansari
ad64ef5c4e
[fix] Incorrect email account as sender (#5657) 
If there are multiple Email Accounts with the same append_to,
then the first one is fetched which is incorrect if there is an
Email Account for the current user.

Now it is first filtered by email_id, if not found falls back to old
behaviour.
 2018-06-05 14:44:49 +05:30
Faris Ansari
22d90df864 NPM Audit fix (#5645) 
- remove unused nightwatch
- update less to 3.0.4
 2018-06-01 12:03:24 +05:30
Saurabh
9cbc1ee7b6 Merge branch 'hotfix' 2018-05-31 17:21:12 +05:30
Saurabh
c903d05c1e bumped to version 10.1.35 2018-05-31 17:51:12 +06:00
Saurabh
5836470c43
Merge pull request #5636 from codingCoffee/management 
Updated Issues and PR Templates
 2018-05-31 17:19:58 +05:30
Ameya Shenoy
7aef384db2
Updated Issues and PR Templates 2018-05-30 19:20:13 +00:00
Ameya Shenoy
9249828235 [css] uncommited files additions (#5620) 2018-05-30 11:10:32 +05:30
Ameya Shenoy
b0c765a8d1 [fix] check if length exists (#5621) 2018-05-28 16:30:24 +05:30
Saurabh
af091ffddd Merge branch 'hotfix' 2018-05-28 11:24:31 +05:30
Saurabh
3079f1c5fe bumped to version 10.1.34 2018-05-28 11:54:31 +06:00
Prateeksha Singh
2bb5dbe5c3 [model][std-fields] make 'Created By' a User Link field (#5600) 2018-05-25 10:58:53 +05:30
Manas Solanki
78c839eb5f handle Int overflow (#5607) 
* handle the int overflow

 - convert the int to the bigint if the length is more than 11

* proper formatting
 2018-05-25 10:47:44 +05:30
Sharath C
22a2c682c9 Jinja Customization from hooks.py bug fix (#5604) 
* Jinja Customization from hooks.py bug fix

* Condition to check for site initialization added.
 2018-05-24 14:26:18 +05:30
Ameya Shenoy
7a4787bb44
Merge branch 'hotfix' 2018-05-24 08:39:55 +00:00
Ameya Shenoy
9a32f55f40 bumped to version 10.1.33 2018-05-24 08:39:55 +00:00
Ameya Shenoy
4f4a169526 Prevents circular linking of docs (#5589) 
* Prevents circular linking of docs

- also added test case to check if code to prevent circular linking of
doctypes works

* created a CircularLinkingError class

- this can be used later if circular linking error needs to be thrown
elsewhere
 2018-05-24 12:07:02 +05:30
Ameya Shenoy
188c4c87db [fix] global-setup-help (#5603) 
- custom jinja templates are taken if and only if a site is mentioned
- added test in travis as well
 2018-05-24 12:05:25 +05:30
rohitwaghchaure
3138234ae2 [Fix] Hyperlink showing in the pdf print (#5590) 2018-05-23 11:27:35 +05:30
Gaurav Naik
e38104dbeb modified address and contact js (#4862) (#5586) 
* modified aaddress and contact js

- temporary fix to handle route_history if docname is naming_series with a '/' in the name- permanant fix would be to modify route options
- PR linked to frappe/erpnext#12215

* considered cases with more '/'s in doc name
 2018-05-23 11:17:33 +05:30
Ameya Shenoy
67fcbaa06b
Merge branch 'hotfix' 2018-05-22 08:43:16 +00:00
Ameya Shenoy
0a45e6af9c bumped to version 10.1.32 2018-05-22 08:43:16 +00:00
Sharath C
873d3c85e8 Add Custom Jinja methods from hooks.py (#5585) 2018-05-22 10:16:38 +05:30
Prateeksha Singh
8246194e78
Merge pull request #5584 from pratu16x7/hotfix 
[hotfix][charts] update, without new build system
 2018-05-21 18:31:22 +05:30
Prateeksha Singh
2e76a75b4b [charts] update, without new build system 2018-05-21 18:03:33 +05:30
rohitwaghchaure
915e9cf876
Merge pull request #5579 from rohitwaghchaure/gstin_not_displaying_in_company_address 
[Fix] GSTIN number not showing in the company address
 2018-05-21 15:18:53 +05:30
Rohit Waghchaure
20492e365d [Fix] GSTIN number not showing in the company address 2018-05-21 15:10:12 +05:30
Rushabh Mehta
1fc8cec2c6
[minor] removed duplicate notify_by_email 2018-05-21 12:27:54 +05:30
Saurabh
757f37aa7a Merge branch 'hotfix' 2018-05-15 12:51:03 +05:30
Saurabh
b42eb308a7 bumped to version 10.1.31 2018-05-15 13:21:03 +06:00
Saurabh
c3b97bc456
Merge pull request #5544 from codingCoffee/opti_addr_contact 
optimized addr_and_contact report by @nabinhait
 2018-05-15 12:08:27 +05:30
Saurabh
c1a338f8c0
Merge pull request #5491 from codingCoffee/decimal_fix 
added handler for decimal object in response
 2018-05-15 11:54:31 +05:30
Saurabh
488e4a5426
Merge pull request #5550 from netchampfaris/hotfix 
Quick Kanban Board
 2018-05-15 11:53:49 +05:30
Faris Ansari
3d5c09d41a
fix codacy 2018-05-15 11:30:52 +05:30
Faris Ansari
4015238512 Quick Kanban Board 
- dont create project implicitly, results in Deadlock most of the time
- add explicit field to set the project
 2018-05-14 12:43:28 +05:30
Ameya Shenoy
9c4f47b461 optimized addr_and_contact report by @nabinhait 
Old implemetation involved 2 sql queries for every party_type, one for
address and one for contact. This was timing out if the party_type size
was too large. New implementation involves 3 queries only.

Stats:
	no_of_records | party_type | old_time | new_time
	--------------+------------+----------+---------
	27000         | Customer   | 209 secs | 1.5 sec
 2018-05-09 17:50:43 +05:30
Nabin Hait
f717296a87 Merge branch 'hotfix' 2018-05-08 15:26:51 +05:30
Nabin Hait
db5682e688 bumped to version 10.1.30 2018-05-08 15:56:51 +06:00
Saurabh
2147bca5d4 [fix] set no_copy property for workflow state field (#5531) 
* [fix] set no_copy property for workflow state field

* [fix] check if custom field exists before loading doc
 2018-05-08 15:16:08 +05:30
Ameya Shenoy
09e71d0d77 added floor and ceil to frappe.utils (#5536) 
Added frappe wrappers to math.ceil and math.floor, since they are widely
used functions. Also added their docstrings for documentation and wote
test cases. And some minor typo fixes
 2018-05-08 15:13:50 +05:30
Nabin Hait
09cbf49ff1
Increase the length of Singles table columns (#5540) 2018-05-08 15:12:00 +05:30
Ameya Shenoy
439effed7d Rebuild help for docs which have been renamed (#5521) 
After execution of a bulk rename, the help cache for the particular
doctype didn't used to change. Added this fix to ensure the help is
rebuilt for the particular doctype whose docs have been renamed
 2018-05-06 11:59:00 +05:30