Subin Tom
ed68f11a46
fix: Supplier invoice importer fix pre release ( #26636 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:47:36 +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
rohitwaghchaure
f3ae7584c5
Merge pull request #26635 from frappe-pr-bot/backport/version-13-pre-release/26576
...
fix: included company in link document type filters for contact
2021-07-26 13:08:33 +05:30
Noah Jacob
64454a5dc8
fix: included company in Link Document Type filters for contact ( #26576 )
...
(cherry picked from commit cbddedab7b
2021-07-26 07:32:43 +00:00
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact ( #26576 ) ( #26634 )
...
(cherry picked from commit cbddedab7b
2021-07-26 13:00:32 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact ( #26576 )
2021-07-26 12:54:35 +05:30
rohitwaghchaure
7aa802a073
Merge pull request #26632 from rohitwaghchaure/merging-13-hotfix-to-13-pre-release-13-8
...
chore: Merging Version 13 hotfix to 13 Pre Release
2021-07-26 12:43:16 +05:30
Rohit Waghchaure
60a0b7fe77
Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8'
2021-07-26 11:34:57 +05:30
ChillarAnand
2d439f2355
chore: Updated CODEOWNERS
2021-07-26 11:08:31 +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
Deepesh Garg
67273b9551
fix: Convert null values to empty string on grouping
2021-07-25 21:26:22 +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
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
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. ( #26585 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
2021-07-25 13:10:50 +05:30
Ankush
96caae1f56
fix: wrong operation time in Work Order ( #26613 ) ( #26617 )
...
* 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>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-07-25 13:01:21 +05:30
Ankush
057a0a9842
ci: auto backport squashed commits based on labels ( #26622 )
2021-07-25 12:49:05 +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
Subin Tom
fac88a3329
fix: Supplier Invoice Importer fix
2021-07-23 21:23:48 +05:30
Subin Tom
2fc39fcade
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-07-23 20:55:24 +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
Anurag0911
4128aa7628
fix: syntax error ( #26610 )
...
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
2021-07-23 16:52:42 +05:30
Rohit Waghchaure
45d506c489
fix: serial no and batch validation
2021-07-23 16:40:45 +05:30
GangaManoj
add2030553
fix: Sider issues
2021-07-23 03:58:27 +05:30
GangaManoj
aed39a23dc
fix: Rename tests
2021-07-23 03:45:59 +05:30
GangaManoj
13e7103ee0
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:44:56 +05:30
GangaManoj
de6d960381
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:36:37 +05:30
GangaManoj
9c07454f91
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-23 03:23:29 +05:30
GangaManoj
caa106b3bd
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-22 22:58:45 +05:30
Nabin Hait
595c7a6e61
fix: merge conflict
2021-07-22 17:11:20 +05:30
Nabin Hait
338f436a1c
Merge branch 'version-13-pre-release' into version-13
2021-07-22 17:05:51 +05:30
Nabin Hait
7551bcf421
bumped to version 13.7.1
2021-07-22 17:25:51 +05:50
rohitwaghchaure
ce3e877c40
fix: incorrect bom name (bp #26600 )
2021-07-22 16:10:58 +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
Devin Slauenwhite
0d968fabfe
fix: missing parameter 'country'
2021-07-22 13:44:09 +05:30
marination
eecfc4c0ae
fix: Clean Serial No input on Server Side
2021-07-22 13:23:54 +05:30
Ankush
4ee6571784
fix: SQL error on fetching RM in production plan ( #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 13:13:46 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release
...
fix: Additional discount calculations in Invoices
2021-07-22 11:30:47 +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
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
Rucha Mahabal
1176761757
feat: Expand All nodes option in Desktop view
2021-07-21 23:19:47 +05:30
Deepesh Garg
9ab18b5341
fix: add company change trigger
2021-07-21 23:18:17 +05:30
