Commit Graph

7064 Commits

Author SHA1 Message Date
barredterra
f9f2faf457 style: use double quotes 2021-09-17 12:03:02 +02:00
barredterra
ad1fad068e reafctor: validate instead of postprocess 2021-09-17 11:58:24 +02:00
barredterra
c8c10ef06b feat: company address query + style 2021-09-17 11:43:09 +02:00
barredterra
553a869bb2 Merge branch 'develop' into payments-based-dunning 2021-09-16 17:23:35 +02:00
barredterra
eaadaf452a feat: child table triggers calculation of totals 2021-09-16 17:22:46 +02:00
barredterra
c4f0a818ad feat: address display 2021-09-16 17:22:25 +02:00
barredterra
4a98c85dba feat: address and contact queries 2021-09-16 17:21:52 +02:00
barredterra
75df843c29 refactor: remove unnecessary code 2021-09-16 17:21:25 +02:00
barredterra
5f0140f02e feat: rework dunning backend 2021-09-16 16:42:51 +02:00
barredterra
7865ef82c1 feat: rework dunning frontend 2021-09-16 16:42:22 +02:00
barredterra
cc80528b91 feat: rework doctypes 2021-09-16 16:38:36 +02:00
Deepesh Garg
c9c8957250 feat: Merge POS invoices based on customer group (#27471)
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-16 19:33:57 +05:30
barredterra
08e53d90a5 refactor: doctype naming
Overdue Payments -> Overdue Payment
2021-09-16 14:09:32 +02:00
Rucha Mahabal
866763c16a fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
barredterra
365c0ca92c feat: restructure dunning doctype 2021-09-15 19:16:09 +02:00
barredterra
ee1070bc94 feat: filter invoices 2021-09-15 19:15:53 +02:00
barredterra
5744c6e1c0 feat: Overdue Payments table 2021-09-15 19:15:31 +02:00
Deepesh Garg
625626b973 fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
Anuja Pawar
a58e309297 fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Anupam Kumar
7edac5a5d7 fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +05:30
Deepesh Garg
9104796eb8 Merge pull request #27258 from deepeshgarg007/tds_validity
feat: Validity dates in Tax Withholding Rates
2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638 fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271 fix: Linting Issues 2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39 fix: Test Case 2021-09-09 11:13:29 +05:30
Saqib
9c27f9be1e fix: document naming rule not working for subscription invoices (#27386) 2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0 fix: General Ledger translation issues (#27298)
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0 fix: scan barcode fields input length (#27389)
* fix: undo unintentional changes

* fix: scan barcode fields input length
2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-08 11:33:42 +05:30
rohitwaghchaure
058d98342a fix: missed to add voucher_type, voucher_no to get GL Entries (#27368)
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-07 12:14:40 +05:30
Deepesh Garg
51d9572fe7 fix: Hardcode fiscal year and posting date 2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04 fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
Deepesh Garg
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Subin Tom
798b464ee3 fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Ankush Menat
eec40513be fix: minor linting issues (#27314)
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
2021-09-02 17:42:45 +05:30
Chillar Anand
915b34391c chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Saqib
a158b825fc Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +05:30
Ankush Menat
b147b85e6a chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac fix: Add Product Bundle field in Items table 2021-09-01 16:06:47 +05:30
Ankush Menat
7d9819f352 fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9 fix: Remove Add Row and Delete Row options for Packed Items table 2021-09-01 15:20:40 +05:30
Ankush Menat
2d62c500c4 fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
694ae81618 fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6 fix: Linting and patch fixes 2021-09-01 10:11:18 +05:30