Zlash65
80f5cb05cc
fixes in setting end_date and manual provision of start&end date
2018-08-30 10:39:48 +05:30
Zlash65
91eae54383
manually provide start and end date
2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6
start date logic fix
2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943
end date / stop date calc fix
2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383
end date should reset if start date is changed
2018-08-30 10:39:48 +05:30
Zlash65
d676a67769
validate changing service stop date once its set
2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15
book last gl_entry based on service stop date
2018-08-30 10:39:48 +05:30
Zlash65
243863a290
validation for stop date added
2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e
service stop date field added
2018-08-30 10:39:48 +05:30
Rushabh Mehta
f31e6153cc
readme: codetriage badge
2018-08-30 10:36:01 +05:30
Rushabh Mehta
20fd2ddd1c
ux(hr): module listing and quick entry for employee
2018-08-30 09:21:54 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab
(fix)test case: loyalty program, course schedule and more
2018-08-29 17:05:11 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Nabin Hait
d982e8fcda
Merge branch 'hotfix'
2018-08-29 13:13:54 +05:30
Nabin Hait
af497ef669
bumped to version 10.1.49
2018-08-29 13:43:53 +06:00
Nabin Hait
6b539d65d7
Restored missing rounded_total fields
2018-08-29 12:41:23 +05:30
Zarrar
af370c8147
Merge pull request #15242 from frappe/revert-15241-google_maps_settings
...
Revert "Google maps settings"
2018-08-28 17:26:47 +05:30
Zarrar
34208cc89d
Revert "Google maps settings"
2018-08-28 17:25:21 +05:30
Saurabh
9cfde278ad
Merge pull request #15241 from saurabh6790/google_maps_settings
...
Google maps settings
2018-08-28 16:28:39 +05:30
Saurabh
5b398f293a
[fix] typo fix
2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0
[fix] naming series refactor patch
2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895
[fix] naming series refactor patch
2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7
[fix] naming series refactor patch
2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74
[fix] fix google map imports ( #15240 )
2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf
[fix] naming series refactor patch
2018-08-28 15:18:48 +05:30
Nabin Hait
2b9186da5a
[fix] naming series patch
2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307
[fix] for python 3
2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7
[fix] missing functions related to google maps
2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3
erpnext: refactor async to is_async ( #15231 )
2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c
minor fix
2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094
[minor][fix] call update_percent_complete via validate ( #15235 )
2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f
Improve performance for warehouse tree ( #15207 )
...
* Fix conflicts
* Modify query structure
* Remove whitespaces
2018-08-28 13:46:22 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Saurabh
fe9ba73c34
Merge pull request #15236 from saurabh6790/v11_patch_fixes
...
patch sequence fix
2018-08-28 13:20:26 +05:30
Saurabh
1898e11585
patch sequence fix
2018-08-28 13:04:40 +05:30
Saurabh
4d0a581c29
Merge pull request #15230 from saurabh6790/v11_patch_fixes
...
[Fix] patch fixes for V11 migration
2018-08-27 18:17:14 +05:30
Saurabh
51570f731c
[Fix] patch fixes for V11 migration
2018-08-27 17:00:51 +05:30
Zarrar
93577665f2
[Enhance] Multiselect for Cost Center and Project ( #15208 )
...
* add filter for Cost Center, make CC & Project multiselect field
* update queries according to project/cost_center multiselect
* add multiselect filter for cost_center and project
* update query according to multiselect
2018-08-27 12:08:53 +05:30
Maxwell Morais
a2c1d92374
Revert "Fix shipping_address for DropShipping" ( #15218 )
...
* Revert "Cleaned up welcome email code (#15175 )"
This reverts commit 771fbb8f010060f4ab2c8d35ff2125d35da06446.
* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187 )"
This reverts commit 2b72d099482992f2a23eb30dd47204388c608549.
* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184 )"
This reverts commit c5cf428d005278339695a1667eb840a201b73a84.
* Revert "[Minor] Create default department on country setup (#15206 )"
This reverts commit 2b2712bb9ede2879057137e08d1e91c1331c3fe5.
* Revert "Permissions issue in BOM tree"
This reverts commit 8fe8d1758a7c7859d2a082b8fc5feaf2ee2d7180.
* Revert "Fix indentation accounts_receivable.py (#15203 )"
This reverts commit fbc3df3247f06d28dd92a6155b39ce1ce45a32fa.
* Revert "Fix shipping_address for DropShipping (#15202 )"
This reverts commit 4a394bcbf409c2d3516696f2b3941e3ff5dc666a.
2018-08-27 12:05:41 +05:30
Ahmed Madi
1516b8d54a
Update asset_category.js ( #15222 )
2018-08-27 12:04:12 +05:30
Zarrar
b94c7075d8
rectify item price route ( #15223 )
2018-08-27 11:44:13 +05:30
rohitwaghchaure
e33047250e
[Fix] Speacial character issue in searching project in sales invoice ( #15220 )
2018-08-27 11:43:57 +05:30
Neil Trini Lasrado
771fbb8f01
Cleaned up welcome email code ( #15175 )
2018-08-24 15:15:56 +05:30
rohitwaghchaure
2b72d09948
[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry ( #15187 )
2018-08-24 11:28:34 +05:30
rohitwaghchaure
c5cf428d00
[Enhance] Provision to backflush raw materials from WIP warehouse ( #15184 )
2018-08-24 11:27:41 +05:30
Zarrar
2b2712bb9e
[Minor] Create default department on country setup ( #15206 )
...
* make default department when creating new company
* remove departments and tds entry for the company
2018-08-24 11:26:51 +05:30
Nabin Hait
8fe8d1758a
Permissions issue in BOM tree
2018-08-23 16:25:51 +05:30
Mario Monroy
fbc3df3247
Fix indentation accounts_receivable.py ( #15203 )
2018-08-23 11:10:15 +05:30
Faris Ansari
c4e38ffd4d
Remove hub page ( #15195 )
2018-08-23 11:09:31 +05:30
