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

32022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
8d39928418 refactor: dashboard indicator when SLA is on hold 2020-06-05 16:36:31 +05:30
Rucha Mahabal
2c9f7cf371 feat: pause SLA on statuses configuration 2020-06-05 16:35:57 +05:30
Rohit Waghchaure
5a82276389 fix: 'ForecastingReport' object has no attribute 'total_demand' 2020-06-05 13:56:20 +05:30
Rucha Mahabal
b29cb87868 refactor: setting avg_response_time moved to communication 2020-06-05 13:35:38 +05:30
Deepesh Garg
407c7bc113
Merge pull request #22067 from marination/item-attribute 
fix: Misleading Error message for Item Attribute.
 2020-06-05 11:21:08 +05:30
P-Froggy
6f87f97efe
fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) 
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field used in the code is not in stock uom while the ordered_qty field is.
Now, the stock_qty field is used for correct comparison with ordered_qty.
 2020-06-05 10:57:07 +05:30
Anurag Mishra
94582a89c7 fix: Wrong filters 2020-06-04 17:50:47 +05:30
Rucha Mahabal
3f08350181 fix: retain Hold status 2020-06-04 15:56:59 +05:30
Marica
d03ebbd51d
Merge branch 'develop' into valuation-rate 2020-06-04 15:31:11 +05:30
rohitwaghchaure
2213ea3d82
Merge pull request #22109 from rohitwaghchaure/routing-operations-not-in-a-sequence 
fix: routing operations not added sequentially in the BOM
 2020-06-04 14:56:10 +05:30
Rohit Waghchaure
404ed88c0c fix: routing operations not added sequentially in the BOM 2020-06-04 14:46:50 +05:30
rohitwaghchaure
dd97a5f4a8
Merge pull request #22107 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked 
fix: import supplier invoice not working
 2020-06-04 14:40:30 +05:30
Rohit Waghchaure
60c1855014 fix: import supplier invoice not working 2020-06-04 14:31:35 +05:30
Anurag Mishra
225802e3a0 fix: problem during assigning 2020-06-04 14:15:55 +05:30
Rucha Mahabal
94d03c6100 fix: remove Service Level DocType from Support Desk Page 2020-06-04 12:35:36 +05:30
Rucha Mahabal
b3338a149b fix: code clean-up 2020-06-04 12:35:00 +05:30
Deepesh Garg
c83ad8185a
Merge pull request #22098 from deepeshgarg007/accounts_payable_error 
fix: Error when no data is present in AR/AP report
 2020-06-03 21:59:28 +05:30
Deepesh Garg
7135a75e5e fix: Error when no data is present in AR/AP reeport 2020-06-03 21:51:21 +05:30
marination
6f7e9d2904 fix: '>=' not supported between instances of 'str' and 'int' 2020-06-03 17:13:58 +05:30
marination
0c72249403 fix: Apply shipping rule without address too 2020-06-03 14:32:07 +05:30
Deepesh Garg
881999d3bf
Merge pull request #22089 from scmmishra/selling-dash-fix 
fix: dashboard chart does not exist on selling page
 2020-06-03 13:38:36 +05:30
Deepesh Garg
fcf19f957e
Merge pull request #22085 from MyuddinKhatri/purchase-receipt-v13 
fix(stock): create purchase invoice from purchase receipt dashboard
 2020-06-03 13:37:06 +05:30
Shivam Mishra
b84dd9b5f5 fix: dashboard chart does not exist on selling page 2020-06-03 13:24:18 +05:30
Myuddin khatri
9276d16420 fix(stock): able to create purchase invoice from purchase receipt dashboard 
able to create purchase invoice from purchase receipt dashboard
 2020-06-03 11:22:49 +05:30
Myuddin khatri
27824cfe6a Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-06-03 11:18:06 +05:30
Deepesh Garg
24f9a80e7d fix(India): Reverse charge mechanism for GST 2020-06-03 10:59:37 +05:30
Shivam Mishra
f460c17961
fix: syntax error (#22082) 2020-06-02 21:48:23 +05:30
Shivam Mishra
789df32683
feat: verify signature on webhook (#21872) 2020-06-02 19:18:22 +05:30
Deepesh Garg
60f3a2b8e7 fix: Add total debit in Journal Entry list view 2020-06-02 18:26:43 +05:30
gavin
7a05662e9f
Merge pull request #21491 from gavindsouza/tally-migration-feat 
feat(Tally migration): Errored documents handling
 2020-06-02 13:03:13 +05:30
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count 
fix(Accounts): Customer Count in Customer Acq. Report wrong
 2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810 indent to tabs instead of spaces 2020-06-01 23:58:05 +05:30
Abhishek Balam
732f5c1867 fixed customer count logic 2020-06-01 23:51:39 +05:30
marination
0df7f0fe9d fix: Misleading Error message for Item Attribute. 2020-06-01 11:56:33 +05:30
Deepesh Garg
ef436fa3c2
Merge pull request #22065 from deepeshgarg007/deferred_accounting_hooks 
fix: Method in hooks for processing deferred revenue
 2020-06-01 11:48:44 +05:30
Deepesh Garg
de03d2cba4 fix: Method in hooks for proccesing deferred revenue 2020-06-01 11:30:34 +05:30
marination
c0c455c471 fix: Procurement Tracker Data Consistency 2020-05-31 20:20:59 +05:30
Deepesh Garg
253660fbd1
Merge pull request #22057 from karthikeyan5/develop-fix-ewb-transin-checksum 
fix(ewb): remove checksum validation for TRANSIN
 2020-05-30 19:48:12 +05:30
karthikeyan5
ca46bedfcb fix(ewb): remove checksum validation for TRANSIN 2020-05-30 15:00:56 +05:30
Saqib
c16e278979
Merge branch 'develop' into update-items-permission-fix 2020-05-30 13:16:55 +05:30
Deepesh Garg
3609ddedbb fix: Purchase receipt item json 2020-05-30 12:03:37 +05:30
Deepesh Garg
159d0734ef fix: Proccurement tracker report test 2020-05-30 11:47:22 +05:30
Deepesh Garg
1aec30d849 fix: Procurement Tracker test case 2020-05-30 11:47:04 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd Revert 'fix: tests depending on global default company' 2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa This reverts commit aa196c0a66 2020-05-30 11:37:36 +05:30
Abhishek Balam
40694c98aa
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-05-30 01:02:06 +05:30
Saqib Ansari
a655db6a79 fix: unexpected removal of print hide field 2020-05-29 22:44:59 +05:30
Saqib Ansari
d531a8ab8d Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix 2020-05-29 22:37:13 +05:30