Deepesh Garg
0011585415
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix
2021-07-26 17:21:13 +05:30
Subin Tom
06fb0b93b5
fix: Supplier invoice importer fix v13 ( #26633 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local >
2021-07-26 16:46:47 +05:30
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact ( #26576 ) ( #26634 )
...
(cherry picked from commit cbddedab7bnoahjacobkurian@gmail.com >
2021-07-26 13:00:32 +05:30
Rucha Mahabal
c676eaae57
fix: test
2021-07-25 23:11:18 +05:30
Rucha Mahabal
6bca87ddb9
fix: remove unnecessary imports
2021-07-25 21:34:51 +05:30
Rucha Mahabal
475d856d66
fix(style): longer titles overflowing
2021-07-25 20:39:51 +05:30
Rucha Mahabal
37198159aa
feat: Export chart option in desktop view
2021-07-25 20:28:01 +05:30
Rucha Mahabal
57cb3ac023
feat: add html2canvas for easily exporting html to images using canvas
2021-07-25 20:23:20 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation ( #26615 )
2021-07-24 00:08:02 +05:30
rohitwaghchaure
9052a3b1a8
Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error
...
fix: serial no and batch validation
2021-07-23 23:38:02 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order ( #26613 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-07-23 20:44:34 +05:30
Deepesh Garg
328444b530
fix(India): Default value for export type
2021-07-23 20:28:02 +05:30
Rohit Waghchaure
45d506c489
fix: serial no and batch validation
2021-07-23 16:40:45 +05:30
rohitwaghchaure
56c67743ab
fix: incorrect bom name ( #26600 )
2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 14:00:01 +05:30
Deepesh Garg
2ff0d3e0eb
fix: Test Cases
2021-07-22 10:43:16 +05:30
rohitwaghchaure
49c5cd66f3
Merge pull request #26586 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report
...
fix: removed Remarks column from AR/AP report
2021-07-22 10:27:15 +05:30
barredterra
a21f76f2a1
feat: add voucher-specific data to datev export
2021-07-21 20:08:20 +02:00
Rucha Mahabal
1176761757
feat: Expand All nodes option in Desktop view
2021-07-21 23:19:47 +05:30
Deepesh Garg
c765073c2a
fix: Tests
2021-07-21 22:28:32 +05:30
Ankush Menat
6928fc17c6
chore: remove warning rules
...
semgrep-action doesn't consider severity, hence ignoring these rules for now.
2021-07-21 19:56:15 +05:30
Rohit Waghchaure
f3158ea448
fix: removed Remarks column from AR/AP report
2021-07-21 19:47:41 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report
...
fix: incorrect valuation rate calculation in gross profit report
2021-07-21 19:35:55 +05:30
Alan
37a886a8a9
Merge branch 'version-13-hotfix' into feat-bom-process-loss
2021-07-21 17:13:36 +05:30
Deepesh Garg
5a06019440
fix: GL For taxes if discount applied on Grand Total
2021-07-21 15:25:40 +05:30
Deepesh Garg
fc09d845c5
fix: Syntax Error
2021-07-21 15:25:09 +05:30
Deepesh Garg
55325ef3a3
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
2021-07-21 14:27:05 +05:30
GangaManoj
4fa409e019
fix: Add mandatory_depends_on property for Discount Account
2021-07-21 14:26:52 +05:30
GangaManoj
45327e04db
fix: Tests
2021-07-21 14:26:52 +05:30
GangaManoj
1f6c05f013
fix: Make discount_account mandatory if discount accounting is enabled
2021-07-21 14:26:52 +05:30
GangaManoj
566e8f8499
fix: Create GL Entries for Additional Discount Account
2021-07-21 14:26:51 +05:30
Ganga Manoj
ed6ebdf5ed
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-07-21 14:24:21 +05:30
Ganga Manoj
821b75f1b1
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-07-21 14:24:21 +05:30
Ganga Manoj
f421dc7ca7
fix: GL Entry creation
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-07-21 14:24:21 +05:30
Ganga Manoj
e7e9bda123
fix: Use the item's project instead of the invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-07-21 14:24:21 +05:30
Ganga Manoj
b4a8bc8e4c
fix: Use the item's cost centre instead of the Invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-07-21 14:24:21 +05:30
GangaManoj
251f229601
fix: Add test for additional discount applied on taxes
2021-07-21 14:23:53 +05:30
GangaManoj
99cb89f449
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice
2021-07-21 14:23:53 +05:30
GangaManoj
99652876d0
fix: Add test for additional discount applied on taxes
2021-07-21 14:23:53 +05:30
GangaManoj
d62af77ca8
fix: Remove unnecessary condition
2021-07-21 14:23:52 +05:30
GangaManoj
4da7c5882b
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-21 14:23:52 +05:30
GangaManoj
9dd2a9e897
fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries
2021-07-21 14:23:52 +05:30
GangaManoj
ff25683378
fix: Filter options for Additional Discount Account
2021-07-21 14:23:52 +05:30
GangaManoj
03f2706971
fix: Add Additional Discount Account field
2021-07-21 14:23:52 +05:30
GangaManoj
d0d9e83ad2
fix: Check all expected GL Entries
2021-07-21 14:23:52 +05:30
GangaManoj
d6f409addc
fix: Sider issues
2021-07-21 14:23:52 +05:30
GangaManoj
38327fc177
fix: Make additional GL Entries for discount applied on taxes
2021-07-21 14:23:52 +05:30
GangaManoj
b64787ee9c
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-21 14:23:52 +05:30
GangaManoj
c1d65cfa8d
fix: Filter options for Additional Discount Account
2021-07-21 14:23:52 +05:30
GangaManoj
9e788cfdcd
fix: Add Additional Discount Account field
2021-07-21 14:23:52 +05:30
