Commit Graph

707 Commits

Author SHA1 Message Date
RobertSchouten
bb7308bbc1 [fix] email digest date range starting with opening balance of day one not closing (#6524)
ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august
2016-10-10 17:17:39 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Nabin Hait
ad8218e5ac minor fix 2016-10-07 16:39:30 +05:30
shreyas
c1b7104126 [Fix] Minor changes to logic 2016-10-07 14:20:51 +05:30
shreyas
a1d7646e70 [Fix] Allow user to save Notification Control without selecting transaction 2016-10-07 12:58:58 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Nabin Hait
5fd5a77750 Fixed version conflict 2016-10-03 14:13:50 +05:30
Umair Sayed
29a0b31ca6 Update sales_partner.js 2016-09-29 16:25:04 +05:30
Nabin Hait
80499bb657 Fixed merge conflict 2016-09-29 14:18:53 +05:30
Rohit Waghchaure
17adb970f1 [Fix] Timesheet detail records not deleted with company transactions deletion 2016-09-29 01:07:28 +05:30
Nabin Hait
706612bcd4 Fixed version conflict 2016-09-26 18:11:56 +05:30
Nabin Hait
7faa4b5fdf Merge pull request #6455 from rohitwaghchaure/retun_field_duplicate_issue
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-26 17:57:28 +05:30
Nabin Hait
f04721ee79 Update naming_series.py 2016-09-26 17:55:34 +05:30
Rohit Waghchaure
d728f5a429 [Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288 2016-09-23 18:06:24 +05:30
Nabin Hait
a36325c6e5 Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
2016-09-20 18:06:49 +05:30
RobertSchouten
8d43b32c2c improvements to email digest (#6323) 2016-09-20 11:11:39 +05:30
Saurabh
9aacf46c51 [fix] minor fix to accomodate custom fields in tree popup 2016-09-19 16:45:35 +05:30
Rushabh Mehta
3aa315040f [fix] paging for item group 2016-09-11 16:48:24 +05:30
Nabin Hait
84306ccc4c Salary component fixtures 2016-08-01 11:54:19 +05:30
Rushabh Mehta
859843687e [minor] add abbr if missing 2016-07-26 08:23:32 +05:30
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Nabin Hait
e6cdb01bea [fix] Query for account fields in Company 2016-07-16 10:59:48 +05:30
Saurabh
6bc7b892c4 [fix] alter fieldtype for is_group from select to check 2016-07-14 14:06:28 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Kanchan Chauhan
d963b76a4b Salary component cleanup 2016-07-06 12:04:38 +05:30
Saurabh
51f66efc7a [minor][fix] set transactions_exist on load of company 2016-07-04 13:06:29 +05:30
Nabin Hait
e3a10170f7 Payment Entry submission and more 2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519 [new][feature] Payment Entry 2016-07-04 11:41:24 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Rushabh Mehta
18357664cb [fix] routing for item group 2016-06-27 15:42:48 +05:30
Rushabh Mehta
a2c4dad90e [fix] product search 2016-06-27 14:55:01 +05:30
Saurabh
d9131ec4ff [minor][fix] remove website generator call on after rename 2016-06-27 12:25:05 +05:30
Rushabh Mehta
723cd64249 [fix] tree view hooks and patch fix 2016-06-25 18:30:03 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
554f6f70aa [fixes] nested set fix for warehouse, tree for accounts and cost center 2016-06-25 11:06:13 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
eda1afb4eb [fixes] comnify tree view 2016-06-25 11:06:13 +05:30
Saurabh
091ca75fa3 [enhance] warehouse browser page for warehouse tree 2016-06-25 11:06:12 +05:30
Saurabh
a4a3b022ee [fix] return route from make_route of child class 2016-06-25 10:43:02 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Rushabh Mehta
8a065e0028 [rename] Bulk Email to Email Queue 2016-06-22 12:58:39 +05:30
Rushabh Mehta
7db1793543 [fix] notification control UX - add update to top, fixes #5349 2016-06-01 13:24:28 +05:30
Nabin Hait
f169e5c04d Ignore permissions for account/warehouse creation from Company 2016-05-30 12:15:36 +05:30
Nabin Hait
310d64d565 Fixed conflict 2016-05-26 16:10:02 +05:30
Nabin Hait
8ed2f87480 Update company.py 2016-05-25 20:06:24 +05:30