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

15001 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nabin Hait
947f409826 Merge branch 'hotfix' 2018-05-05 12:08:47 +05:30
Nabin Hait
00adb31d69 bumped to version 10.1.29 2018-05-05 12:38:47 +06:00
Ameya Shenoy
5cc28b1257 pip fix (#5527) 2018-05-04 19:05:48 +05:30
ci2014
8b2e4a5f4c Check for list_renderer before accessing settings (#5469) 
* Check for list_renderer before accessing settings

In the master version of frappe, in the first attempt of calling the file manager (when onload is called) the report doesn't build, because in the report view, there is no such attribute list_renderer available.

In that change we check if the list renderer is not undefined and only setup the menu, drag and drop and copy function, when the list_renderer object is available.

This problem might not occur in the developer versions (datatables), but many people still work with the master version and need a working file manager report.

* Update file_list.js
 2018-05-04 13:15:30 +05:30
Prateeksha Singh
329831512b
Merge pull request #5520 from netchampfaris/printview-footer 
Show footer in Full Page printview
 2018-05-03 17:37:20 +05:30
Faris Ansari
1cef6890e3 Show footer in Full Page printview 2018-05-03 16:12:16 +05:30
Nabin Hait
03264d5d6a minor fix 2018-05-03 10:45:18 +05:30
Saurabh
880d2e5101 Merge branch 'hotfix' 2018-05-02 21:36:12 +05:30
Saurabh
bded2cd3e9 bumped to version 10.1.28 2018-05-02 22:06:12 +06:00
Saurabh
869976b1bc
Merge pull request #5517 from codingCoffee/travis 
dark magic to revive travis
 2018-05-02 21:35:30 +05:30
Saurabh
7ed0621e1e
Merge pull request #5518 from netchampfaris/handle-row-dict-list 
Handle row which can be dict or list
 2018-05-02 21:34:28 +05:30
Faris Ansari
c8538445ab Handle row which can be dict or list 
- (why no normalization?)
 2018-05-02 21:29:41 +05:30
Ameya Shenoy
ab0198b513
dark magic to revive travis 
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
 2018-05-02 17:30:35 +05:30
Saurabh
cef7f1c3b9 Merge branch 'hotfix' 2018-05-02 16:18:47 +05:30
Saurabh
36cfa144e6 bumped to version 10.1.27 2018-05-02 16:48:47 +06:00
Saurabh
5e489228f3
Merge pull request #5516 from surajshetty3416/hotfix 
[urgent] Fix query_report has_match
 2018-05-02 16:15:24 +05:30
Suraj Shetty
7cba1f41a5 [urgent] Fix query_report has_match 2018-05-02 16:06:59 +05:30
Saurabh
c4d598cd99 Merge branch 'hotfix' 2018-05-02 14:51:45 +05:30
Saurabh
74c645b6d2 bumped to version 10.1.26 2018-05-02 15:21:45 +06:00
Saurabh
10dec5db25
Merge pull request #5513 from frappe/revert-5486-hotfix 
Revert "Hotfix to allow for modal to be scrolled"
 2018-05-02 13:22:17 +05:30
Saurabh
1d0fdf7dcc Revert "Hotfix to allow for modal to be scrolled (#5486)" 
This reverts commit 526ebb71a3.
 2018-05-02 13:18:50 +05:30
spa49
526ebb71a3 Hotfix to allow for modal to be scrolled (#5486) 
* Update desk.css

* Update desk.less
 2018-05-02 11:08:20 +05:30
Faris Ansari
1ccf9d85b8
get_emails_from_role should only pickup enabled users (#5504) 2018-05-02 11:02:07 +05:30
Prateeksha Singh
be8f73f551
Merge pull request #5510 from pratu16x7/hotfix 
[control] code value field
 2018-05-01 10:23:26 +05:30
Prateeksha Singh
7cc6f9482c [control] code value field 2018-05-01 08:21:13 +05:30
Ameya Shenoy
b6ec76c2db i still don't know why we're still using travis (#5500) 2018-04-30 11:30:27 +05:30
Zarrar
8da9a7e86f hide user-progress and help for mobile view (#5492) 2018-04-30 11:29:33 +05:30
Zarrar
efa359e201 restore original permissions for standard and custom doctypes (#5498) 2018-04-30 11:29:05 +05:30