Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,350 Commits 3 Branches 0 Tags 1 GiB
1eb098caf9
Commit Graph

24350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
1eb098caf9 Add additional condition condition to get_pos_profile 
- If we have any POS Profile related to the user,
that profile should be used
 2018-11-21 14:36:58 +05:30
Frappe Bot
64b4d98778 Merge branch 'staging-fixes' into staging 2018-11-15 09:43:08 +00:00
Frappe Bot
d9dccaefba bumped to version 11.0.3-beta.24 2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197 bumped to version 11.0.3-beta.23 2018-11-15 09:37:17 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary 
[Fix] Accounts receivable summary print format showing zero values
 2018-11-15 14:52:16 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch 
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
 2018-11-15 14:50:58 +05:30
Frappe Bot
6647ea270c Merge branch 'staging-fixes' into staging 2018-11-15 09:19:18 +00:00
Frappe Bot
a4fe912382 bumped to version 11.0.3-beta.23 2018-11-15 09:19:18 +00:00
Frappe Bot
98b4a1bc81 Merge branch 'master' into staging-fixes 2018-11-15 09:12:04 +00:00
Frappe Bot
0b697c5298 Merge branch 'hotfix' 2018-11-15 09:04:14 +00:00
Frappe Bot
2426d00dd6 bumped to version 10.1.72 2018-11-15 09:04:14 +00:00
rohitwaghchaure
cc907559d0
Merge pull request #15992 from rohitwaghchaure/code_optimization_for_consolidated_report 
Code optimization for consolidated financial statement report
 2018-11-15 13:48:17 +05:30
Rohit Waghchaure
704796b1cb Code optimization for consolidated financial statement report 2018-11-15 13:46:18 +05:30
rohitwaghchaure
02a7f8f0b2
Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue 
[Fix] Consolidated financial statement report currency conversion issue
 2018-11-15 12:56:11 +05:30
Rohit Waghchaure
9d0f90975b [Fix] Consolidated financial statement report currency conversion issue 2018-11-15 12:55:20 +05:30
rohitwaghchaure
93f358778b
Merge pull request #15990 from rohitwaghchaure/patch_code_refactor 
[Minor] Patch fixes
 2018-11-15 12:21:46 +05:30
Rohit Waghchaure
43920530a1 [Minor] Patch fixes 2018-11-15 12:20:27 +05:30
Deepesh Garg
3b8c84fa75
Merge pull request #15975 from nabinhait/staging-fixes 
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
 2018-11-15 12:01:09 +05:30
rohitwaghchaure
e907c0d15c
Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report 
Added currency filter in consolidated financial statement report
 2018-11-15 10:53:02 +05:30
Rohit Waghchaure
a95697f506 Added currency filter in consolidated financial statement report 2018-11-14 19:55:44 +05:30
Aditya Hase
d168a71cfb perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE 
update_total_qty_field patch was using UPDATE statement with CASE

Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
 2018-11-14 19:09:07 +05:30
Frappe Bot
e4193030b1 Merge branch 'staging-fixes' into staging 2018-11-14 11:33:03 +00:00
Frappe Bot
fac49983a0 bumped to version 11.0.3-beta.22 2018-11-14 11:32:34 +00:00
rohitwaghchaure
ba97b9b2d8
Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed 
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
 2018-11-14 15:12:45 +05:30
rohitwaghchaure
593f3f1756
Merge pull request #15978 from nabinhait/fetch_from_fix 
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
 2018-11-14 15:11:26 +05:30
rohitwaghchaure
5395b164cd
Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue 
Claimed amount is not reset on cancel of employee advance
 2018-11-14 13:21:11 +05:30
Rohit Waghchaure
047a7123eb Claimed amount is not reset on cancel 2018-11-14 13:20:00 +05:30
Rohit Waghchaure
917dda1b76 [Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually 2018-11-14 01:18:41 +05:30
Nabin Hait
367a076fa4 fix(discount): Fixed item discount amount calculation 2018-11-13 18:41:58 +05:30
Nabin Hait
d34bfa8c2c fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes 2018-11-13 18:21:22 +05:30
Frappe Bot
fe62024824 bumped to version 11.0.3-beta.21 2018-11-13 11:41:27 +00:00
Nabin Hait
3409e55d24
Merge pull request #15974 from Alsum/assign-sa 
assign-sa-to-group-of-employees
 2018-11-13 16:55:17 +05:30
deepeshgarg007
7bc6f3843a Fix for accounts Receivable Summary Showing zero values 2018-11-13 16:54:54 +05:30
Frappe Bot
25a74b8283 Merge branch 'staging-fixes' into staging 2018-11-13 11:23:06 +00:00
Frappe Bot
a29237beeb bumped to version 11.0.3-beta.21 2018-11-13 11:23:06 +00:00
Nabin Hait
7fe4124bb8 fix(field property): Made barcode field non-mandatory in item 2018-11-13 16:48:59 +05:30
Frappe Bot
88c88d6e7c Merge branch 'master' into staging-fixes 2018-11-13 10:59:05 +00:00
Frappe Bot
cb1726d6ec Merge branch 'hotfix' 2018-11-13 10:55:31 +00:00
Frappe Bot
6b78e520d2 bumped to version 10.1.71 2018-11-13 10:55:31 +00:00
Nabin Hait
688758a56f fix(test): Fixed item discount amount calculation and test cases related to pricing rule 2018-11-13 16:13:16 +05:30
alsum
e04a753d53 assign-sa-to-group-of-employees 2018-11-13 11:43:58 +02:00
Nabin Hait
ee887f4db7
Merge pull request #15796 from Alsum/set_current_asset_value 
trigger set_current_asset_value when make asset_value_adjustment from asset form
 2018-11-13 12:42:28 +05:30
Nabin Hait
ee190e34c2
Update asset_value_adjustment.js 2018-11-13 12:41:36 +05:30
Saif
60ec88bcc8 Added Default Warehouse field that sets all item's warehouse (#15462) 
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied

* Set def_warehouse in test_sales_order.py

* Changed from def_warehouse to set_warehouse

* Rest of def_warehouse to set_warehouse
 2018-11-13 12:37:53 +05:30
Alchez
ce3340903d Update Delivery Trip status based on visited stops (#15723) 
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops

* feat(delivery_trip_status): Fix tests

* feat(delivery_trip_status): Fix allow on submit for status

* feat(delivery_trip_status): Change status mapping

* feat(delivery_trip_status): Fix patch

* Update update_delivery_trip_status.py
 2018-11-13 12:22:17 +05:30
Alchez
9f87c441b0 feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view (#15706) 2018-11-13 12:20:05 +05:30
khushalti
fad08e1bcb [fix] - GL entry not creating on PR if rejected qty mentoned (#15815) 2018-11-13 12:09:32 +05:30
Alchez
6f1fd193eb fix(production_plan): Allow work orders to be cancelled (#15955) 2018-11-13 11:47:23 +05:30
rohitwaghchaure
849169e82b
Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count 
[Fix] Company dashboard sales count condition
 2018-11-13 11:37:26 +05:30
Britlog
7d9689cc92 [Fix] Website Conversion factor query (#15866) 
* [Fix] Conversion factor query

* Update product.py
 2018-11-13 11:36:41 +05:30