nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-24 20:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,847 Commits 609 Branches 1,802 Tags
4bac0daf9bc33487e6c0bab91a8d18bdb9843686
Commit Graph

32985 Commits

Author SHA1 Message Date
Rohit Waghchaure
4bac0daf9b fix: internal transfer flow 2022-09-07 14:29:15 +05:30
Sagar Sharma
404668fcc9 fix: require barcode item barcode (#32111) 
fix: require barcode item barcode. (#31957)

* fix: require barcode item barcode.

* fix: make supplier mandatory in Item Supplier DocType

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2022-09-07 14:24:12 +05:30
Sagar Sharma
09d8fa4b5d fix: AD not getting copied from SCO while creating a Material Transfer (#32109) 
fix: AD not getting copied from SCO while creating a Material Transfer (#32106)
 2022-09-07 12:42:12 +05:30
Deepesh Garg
354aaae587 Merge pull request #32088 from frappe/mergify/bp/version-14-hotfix/pr-32086 
fix: QR Code multi currency issue (backport #32086)
 2022-09-07 07:46:41 +05:30
Rohit Waghchaure
6ab0637b0b test: test cases for PI and DN 2022-09-06 11:54:56 +05:30
Rohit Waghchaure
76ae4d87ca fix: fetch from parent not working for custom field 2022-09-06 11:54:48 +05:30
Rucha Mahabal
3c688dfa6d feat: tabbed view for Employee form (#31940) (#32095) 2022-09-06 11:04:13 +05:30
Sagar Sharma
121ec83562 refactor(test): test_update_reserved_qty_for_subcontracting 
(cherry picked from commit a349b58306)
 2022-09-05 08:50:29 +00:00
Sagar Sharma
26536da74b fix: validate available qty for consumption in SCR 
(cherry picked from commit 4a7add2169)
 2022-09-05 08:50:28 +00:00
hamzaali15
d14a9a1e89 fix: QR Code multi currency issue 
When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount

(cherry picked from commit b10a2b87b6)
 2022-09-05 07:13:08 +00:00
Sagar Vora
b7e8fbe43f test: dont create lead manually, add coverage for notes 
(cherry picked from commit 875ff15109)
 2022-09-05 06:56:48 +00:00
Sagar Vora
00a73c7a57 fix(Appointment): create lead notes as child table 
(cherry picked from commit 58e553151e)
 2022-09-05 06:56:47 +00:00
Deepesh Garg
6976316ada chore: fix message 
(cherry picked from commit 118b0c0f86)
 2022-09-04 13:34:32 +00:00
Florian HENRY
357f74a580 chore: better text 
(cherry picked from commit d19b664ba9)
 2022-09-04 13:34:32 +00:00
Florian HENRY
aedd0397b8 chore: remove debug 
(cherry picked from commit ac66538651)
 2022-09-04 13:34:32 +00:00
Florian HENRY
4cb685a326 fix: upgrade process to version-14 when currency opportunity wass not set 
(cherry picked from commit 9d02fbadb4)
 2022-09-04 13:34:31 +00:00
Deepesh Garg
afcc0cbccd Merge pull request #32079 from frappe/mergify/bp/version-14-hotfix/pr-31954 
feat: better Item Price list view (backport #31954)
 2022-09-04 18:15:25 +05:30
HENRY Florian
784fb47197 feat: better Item Price list view (#31954) 
* feat: better Item Price list view

(cherry picked from commit 86395c6adb)
 2022-09-04 12:39:04 +00:00
Solufyin
5520c6b2f3 fix: Naming series in Journal Entry Template 
(cherry picked from commit 2085626390)
 2022-09-04 11:05:07 +00:00
Deepesh Garg
f873547447 Merge pull request #32074 from frappe/mergify/bp/version-14-hotfix/pr-31850 
feat: two new filters for gross profit (backport #31850)
 2022-09-04 16:21:54 +05:30
Deepesh Garg
d65d2f617d Merge pull request #32071 from frappe/mergify/bp/version-14-hotfix/pr-32053 
fix: KSA VAT report multi currency amount issue (backport #32053)
 2022-09-04 15:58:50 +05:30
Deepesh Garg
0438433a4f chore: Linting Issues 
(cherry picked from commit ad8d0efa29)
 2022-09-04 10:27:23 +00:00
hrzzz
055556b7f1 fix: remove spaces and order import 
(cherry picked from commit 3ef551872a)
 2022-09-04 10:27:23 +00:00
hrzzz
60fa421409 feat: two new filters for gross profit 
(cherry picked from commit 27891ecb77)
 2022-09-04 10:27:23 +00:00
Saqib Ansari
319ee41403 fix(pos): error while consolidating pos invoices 
(cherry picked from commit 33762dbbac)
 2022-09-04 07:56:31 +00:00
hamzaali15
b96526eefd fix: KSA VAT report multi currency amount issue 
In KSA VAT report amount is not showing correctly for multi currencies because net_amount field is fetched instead of base_net_amount

(cherry picked from commit 56d8962e40)
 2022-09-04 07:43:32 +00:00
Rohit Waghchaure
f871dd4ef6 fix: not able to make variant item 
(cherry picked from commit 92b0f9cd7e)
 2022-09-03 06:23:27 +00:00
ruthra kumar
4698dba402 test: pda document submission and cancellation 
(cherry picked from commit 1c385541fa)
 2022-09-02 11:15:32 +00:00
ruthra kumar
f55881aef8 fix: incorrect import parameter for cancel PDA 
(cherry picked from commit 08f2e4edc3)
 2022-09-02 11:15:31 +00:00
ruthra kumar
4409f11282 fix: key error on consolidated financial report 
accounts with same name but different account number will throw key
error on consolidated report

(cherry picked from commit 6e8395cccd)
 2022-09-02 10:46:42 +00:00
ruthra kumar
d9632e8138 test: payments against so/po will show up as outstanding amount 
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO

(cherry picked from commit 36f5883dda)
 2022-09-02 08:15:36 +00:00
ruthra kumar
4bbd0ec985 fix: include payment against PO in AR/AP report 
(cherry picked from commit fdd167cac1)
 2022-09-02 08:15:36 +00:00
mergify[bot]
92f8f0ec74 chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On (backport #32048) (#32050) 
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On (#32048)

chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings
(cherry picked from commit 68907ca783)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-09-02 09:10:17 +05:30
Deepesh Garg
52fc10d00c chore: Add check for principal amount 
(cherry picked from commit a76d3827ec)
 2022-08-30 15:47:11 +00:00
Deepesh Garg
1b9082e07b fix: Loan Interest accruals for 0 rated loans 
(cherry picked from commit eefc9b7172)
 2022-08-30 15:47:11 +00:00
mergify[bot]
0e9a1fb40e fix: force delete old report docs (backport #32026) (#32027) 
fix: force delete old report docs (#32026)

(cherry picked from commit ffa3071d36)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-30 15:46:08 +05:30
MOHAMMED NIYAS
8717235a34 fix: lost quotation not to expired 
(cherry picked from commit 69ffef8c0e)
 2022-08-30 05:03:44 +00:00
Deepesh Garg
670426f428 Merge pull request #32017 from frappe/mergify/bp/version-14-hotfix/pr-32016 
fix: permissions for Task Type (backport #32016)
 2022-08-30 08:38:14 +05:30
mergify[bot]
1b5a1cbaad fix(patch): update sla doctype directly (backport #32014) (#32015) 
fix(patch): update sla doctype directly (#32014)

fix: update sla doctype directly
(cherry picked from commit 2d41704424)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-29 22:17:39 +05:30
Raffael Meyer
7ca1beb15d fix: permissions for Task Type (#32016) 
(cherry picked from commit 73f4d5931d)
 2022-08-29 16:27:00 +00:00
ruthra kumar
0aaf9c4f05 chore: add remarks migration to patches.txt 
(cherry picked from commit d522f13d55)
 2022-08-29 19:52:33 +05:30
ruthra kumar
b3b0272ec9 chore: patch for migrating remarks to payment ledger 
(cherry picked from commit 3a6b095ed4)
 2022-08-29 14:19:46 +00:00
ruthra kumar
f7898b4954 refactor: re-add remarks field to payment ledger and AR/AP report 
(cherry picked from commit 5782c4469a)
 2022-08-29 14:19:46 +00:00
Deepesh Garg
b067eae38c Merge pull request #32008 from frappe/mergify/bp/version-14-hotfix/pr-32006 
fix: Rounded total for cash and non trade discount invoices (backport #32006)
 2022-08-29 17:46:14 +05:30
mergify[bot]
cee867f941 fix: AD not getting copied from SCO while creating a SE (backport #32004) (#32007) 
fix: AD not getting copied from SCO while creating a SE (#32004)

(cherry picked from commit 9dbaaa33f5)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-29 15:50:22 +05:30
Deepesh Garg
6c4fcd80c6 fix: Rounded total for cash and non trade discount invoices 
(cherry picked from commit 318da16b99)
 2022-08-29 10:06:08 +00:00
Deepesh Garg
11657effa5 Merge pull request #31970 from frappe/mergify/bp/version-14-hotfix/pr-31955 
chore: update french translation (backport #31955)
 2022-08-28 11:32:54 +05:30
Deepesh Garg
d3b7942f32 Merge pull request #31979 from frappe/mergify/bp/version-14-hotfix/pr-31977 
fix: restrict party types to Supplier/Customer for AR/AP report (backport #31977)
 2022-08-28 11:25:00 +05:30
mergify[bot]
f407c972d1 chore: allow return of components in SCO (backport #31994) (#31995) 
chore: allow return of components in SCO (#31994)

chore: allow return of components in sco
(cherry picked from commit af5cbc881f)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-26 23:15:20 +05:30
Deepesh Garg
0b72295fa2 Merge pull request #31990 from frappe/mergify/bp/version-14-hotfix/pr-31988 
chore: remove precision on discount_percentage of Sales Invoice Item (backport #31988)
 2022-08-26 18:09:26 +05:30