Zarrar
91fc1a8fbe
Update Territory & Customer Group across all transaction ( #13004 )
...
* added method for update query based on changes
* patch added
* updated function, moved util function
2018-02-27 15:56:38 +05:30
Ameya Shenoy
3ee22f0137
rename valid_email to validate_email ( #13103 )
2018-02-27 12:59:12 +05:30
rohitwaghchaure
f1755fb5b1
Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1
...
[Hotfix] POS discount issue
2018-02-27 11:58:33 +05:30
Manas Solanki
be841ccc53
Merge pull request #13096 from manassolanki/fix-fee-schedule
...
Fixes in the Fees Schedule
2018-02-27 11:23:38 +05:30
Frappe PR Bot
c6e2d750bb
[Translation] Updated Translations ( #13097 )
2018-02-27 11:00:59 +05:30
Zarrar
033eb779d4
minor fixes for member ( #13101 )
2018-02-27 11:00:47 +05:30
Manas Solanki
51dfba749b
filter students on basis of category and button to show fees
2018-02-26 19:32:26 +05:30
Nabin Hait
3799f8bec9
Don't validate serial nos while cancelling the transaction
2018-02-26 16:39:06 +05:30
Zarrar
e53a238665
minor fix ( #13095 )
2018-02-26 15:59:20 +05:30
Shreya Shah
70a57e08fd
New Report Employee Advance Summary ( #13040 )
...
* New Report Employee Advance Summary
* JSON style column definition
2018-02-26 15:58:57 +05:30
Rohit Waghchaure
3edc101957
[Fix] POS discount issue
2018-02-26 13:25:58 +05:30
Nabin Hait
127c61e930
Fixed logic in itemwise recommended reorder level
2018-02-26 12:43:17 +05:30
rohitwaghchaure
8ffd5d40e3
[Fix] UX for delivery trip ( #13046 )
...
* [Fix] UX for delivery trip
* Fixed test cases
2018-02-26 12:25:39 +05:30
tundebabzy
9360f81b94
Validity of Quotation #12858 ( #13078 )
...
* add new setting for default valid_till date
* codacy cleanup
2018-02-26 12:23:41 +05:30
Nabin Hait
e55831a89c
Projected Qty in Auto reorder email
2018-02-26 11:38:40 +05:30
Nabin Hait
2572b05b35
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-25 10:45:24 +05:30
Zarrar
4a0d27078e
optimize patch for faster execution ( #13068 )
2018-02-23 17:41:32 +05:30
Achilles Rasquinha
a3555aa7bd
[FIX] sorting multiple compares
2018-02-23 17:22:07 +05:30
Nabin Hait
802819df9d
Merge branch 'master' into develop
2018-02-23 16:59:44 +05:30
Nabin Hait
4ff4d185f7
Merge branch 'hotfix'
2018-02-23 16:59:42 +05:30
Nabin Hait
d54953e419
bumped to version 10.1.4
2018-02-23 17:29:42 +06:00
Zarrar
339426c926
fix permission issue for stock balance report - Item Group ( #13069 )
2018-02-23 16:58:55 +05:30
Nabin Hait
7570774ebe
Merge branch 'master' into develop
2018-02-23 16:49:43 +05:30
Nabin Hait
489ff6e21c
Merge branch 'hotfix'
2018-02-23 16:49:41 +05:30
Nabin Hait
d12fb58c12
bumped to version 10.1.3
2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce
verify payment entry amount is positive ( #13066 )
...
* verify payment entry amount is positive
* Update sales_invoice.py
* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb
[Fix] Item wise sales register report ( #13055 )
2018-02-23 16:25:30 +05:30
Shreya Shah
70a68897cc
auto name on the basis of naming series ( #13056 )
2018-02-23 16:24:59 +05:30
Shreya Shah
d5b2e39f45
improve validation ( #13058 )
2018-02-23 16:23:57 +05:30
Frappe PR Bot
239c121f7d
[Translation] Updated Translations ( #13059 )
2018-02-23 16:23:00 +05:30
rohitwaghchaure
dd0fc1084e
[Fix] PDC amount, PDC print layout issue ( #13062 )
2018-02-23 16:20:46 +05:30
Faris Ansari
97b212e348
Patch optimization ( #13060 )
...
* Patch fixes
* fix codacy
* Update item_barcode_childtable_migrate.py
2018-02-23 16:19:41 +05:30
Raghavendra Kamath
1a9388acbb
Clean inline css found in chapter and grant for loops! ( #13038 )
...
* Clean inline css found in chapter and grant for loops!
* Remove redundant css
* remove unwanted ide files and append gitignore
* remove unnecessary line from build.json
* restore import for variable.less
* remove kdev from gitignore
2018-02-23 14:34:44 +05:30
Nabin Hait
d283ee73f3
Fetch timesheet based on project
2018-02-23 12:58:39 +05:30
Nabin Hait
5b9f3b0cd3
Merge branch 'master' into develop
2018-02-22 18:18:36 +05:30
Nabin Hait
93f138eece
Merge branch 'hotfix'
2018-02-22 18:18:34 +05:30
Nabin Hait
2b2cf13408
bumped to version 10.1.2
2018-02-22 18:48:34 +06:00
Nabin Hait
7f49b57aaa
Update added_extra_gst_custom_field_in_gstr2.py
2018-02-22 18:17:57 +05:30
Nabin Hait
0e3db275e5
Merge branch 'master' into develop
2018-02-22 18:10:39 +05:30
Nabin Hait
00330f52bd
Merge branch 'hotfix'
2018-02-22 18:10:37 +05:30
Nabin Hait
6b69fc7e5d
bumped to version 10.1.1
2018-02-22 18:40:37 +06:00
Saurabh
d8cd54dfd0
[fix] remove gstr2 fields from Sales Invoice and Delivery Note too ( #13047 )
2018-02-22 18:05:40 +05:30
Suraj Shetty
8a41887f68
patch exception fixes ( #13037 )
...
* patch exception fixes
* reload daily_work_summary_group_user doctype
2018-02-22 15:56:33 +05:30
tundebabzy
2949e9c5dc
Merge pull request #13036 from tundebabzy/issue-13019
...
Uncaught Server Exception : adjust_qty_for_expired_items #13019
2018-02-22 11:04:53 +01:00
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Nabin Hait
15bd3167a8
Merge branch 'hotfix'
2018-02-22 14:39:37 +05:30
Nabin Hait
9b530fb2cb
bumped to version 10.1.0
2018-02-22 15:09:37 +06:00
Nabin Hait
06bace9089
Fixed develop version
2018-02-22 14:36:26 +05:30
tundebabzy
c15978fca0
fix indentation
2018-02-22 09:50:49 +01:00
Nabin Hait
cb2264e0b4
Merge branch 'vishdha-leaderboard' into hotfix
2018-02-22 14:00:04 +05:30
