Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,745 Commits 3 Branches 0 Tags 1 GiB
9270de59f4
Commit Graph

6750 Commits

Author SHA1 Message Date
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Anuja Pawar
1cba77cfbd
fix: Sales Return cancellation if linked with Payment Entry (#26551) 2021-08-10 17:25:12 +05:30
Afshan
af2f5277d5
fix: pos profile not mandatory for Sales Invoice (#26853) 2021-08-10 14:16:16 +05:30
Francisco Roldan
7e3dd9e8ee fix: depends_on in price list field 2021-08-09 11:21:41 -03:00
Anupam Kumar
9c04c297b8
refactor: Accounts Settings form cleanup (#26842) 2021-08-09 14:01:02 +05:30
Ankush
07337d5c78
fix: validate python expressions (#26835) 2021-08-09 12:38:40 +05:30
Saqib
f1141e7756
fix: failing budget test due to project naming (#26834) 2021-08-06 17:37:17 +05:30
Deepesh Garg
1d90f7684e
fix: Do not fetch fully return issued purchase receipts (#26809) 2021-08-05 19:17:32 +05:30
François de Ryckel
005291e6dd
fix: typo in error message (#26816) 2021-08-04 21:59:18 +05:30
Deepesh Garg
346bde875c Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report 2021-08-03 14:44:20 +05:30
Subin Tom
e99cd2e9da
fix: POS Invoice consolidated Sales Invoice field set to no copy (#26706) 2021-08-02 11:39:20 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report 2021-08-02 10:42:04 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Deepesh Garg
36f6e9b58e
Merge pull request #26654 from marination/pi-expense-account 
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
 2021-07-31 17:32:24 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Deepesh Garg
6eded547f5 fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-30 20:12:51 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 
fix: Parent condition in pricing rules
 2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting 2021-07-29 15:41:22 +05:30
Ankush
f8343890b9
feat: don't recompute taxes (#26695) 2021-07-29 11:09:34 +05:30
Deepesh Garg
e79bfbb104
Merge pull request #26665 from ankush/dont_recompute_taxes 
feat: don't recompute taxes
 2021-07-28 19:36:27 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Marica
d43e6ced91
Merge branch 'develop' into pi-expense-account 2021-07-28 14:38:48 +05:30
Deepesh Garg
441adf763f fix(minor): Consider grand total for threshold check 2021-07-28 10:51:50 +05:30
rohitwaghchaure
c1eb5a06a3
Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop 
fix: removed Remarks column from AR/AP report
 2021-07-27 22:23:40 +05:30
Rohit Waghchaure
5d121c41f3 fix: removed Remarks column from AR/AP report 2021-07-27 22:22:56 +05:30
Deepesh Garg
5a7fad8a6a feat: Enhancements in TDS 2021-07-27 18:55:14 +05:30
Deepesh Garg
9d8efbe1db
Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release 
fix: Exchange rate revaluation posting date and precision fixes
 2021-07-27 16:41:59 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes 2021-07-27 14:49:44 +05:30
Anuja Pawar
9302e0b6c5
Merge branch 'develop' into sa-vat-report 2021-07-27 10:18:53 +05:30
Deepesh Garg
831ce88d1c
Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release 
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
 2021-07-27 10:16:04 +05:30
marination
77f9f048b6 chore: test case for missing default warehouse on mapping 2021-07-26 21:33:17 +05:30
marination
5c82af50f9 fix: Set Expense account from warehouse only if warehouse exists 2021-07-26 19:41:53 +05:30
Deepesh Garg
3fcc5e3134 fix: Convert null values to empty string on grouping 2021-07-26 19:09:09 +05:30
Deepesh Garg
19a0ca1980 fix: Ignore GL Entry on cancel 2021-07-26 19:08:56 +05:30
Deepesh Garg
356a55258e fix: Exchange rate revaluation posting date and precision fixes 2021-07-26 19:08:45 +05:30
Subin Tom
50b76d04bf fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-26 16:52:05 +05:30
Deepesh Garg
67273b9551 fix: Convert null values to empty string on grouping 2021-07-25 21:26:22 +05:30
Deepesh Garg
a8bf61c14e Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes 2021-07-25 19:58:04 +05:30
Deepesh Garg
c485d5c3b7 fix: Ignore GL Entry on cancel 2021-07-25 19:46:50 +05:30
Deepesh Garg
f4701c174a fix: Exchange rate revaluation posting date and precision fixes 2021-07-25 19:46:20 +05:30
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Subin Tom
b24a149dbc test: Updated test case for Eway bill 2021-07-19 14:37:12 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report 2021-07-18 11:13:25 +05:30
Devin Slauenwhite
d5ff636159 fix: missing parameter 'country' 2021-07-17 14:42:38 -04:00
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30