CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 08:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,853 Commits 416 Branches 1,717 Tags
9b6dd7e71f541a8cd64521c4327abf0d856d2fa7
Commit Graph

42853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
9b6dd7e71f Merge pull request #32120 from rohitwaghchaure/backport-provision-to-manual-reposting 
fix: option to start reposting from repost item valuation
 2022-09-07 18:05:38 +05:30
Rohit Waghchaure
64831952d5 fix: option to start reposting from repost item valuation 2022-09-07 18:04:43 +05:30
rohitwaghchaure
d53fd8c592 Merge pull request #32119 from rohitwaghchaure/backport-fixed-label-not-showing-for-filter 
fix: inventory dimension filter's label not showing in the reort
 2022-09-07 18:03:51 +05:30
Rohit Waghchaure
2d2eef6b29 fix: inventory dimension filter's label not showing in the reort 2022-09-07 18:02:41 +05:30
rohitwaghchaure
c313c37006 Merge pull request #32114 from rohitwaghchaure/backport-fixed-internal-transfer-flow 
fix: backport fixed internal transfer flow
 2022-09-07 15:44:01 +05:30
Rohit Waghchaure
a00bc2967e test: added test case for internal transfer 2022-09-07 14:29:21 +05:30
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
rohitwaghchaure
22b2386aa1 Merge pull request #32097 from rohitwaghchaure/backport-fixed-fetch-from-parent 
fix: fetch from parent
 2022-09-06 12:59:37 +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
8b8d054ded Merge pull request #32090 from frappe/mergify/bp/version-14-hotfix/pr-32082 
fix: validate available qty for consumption in SCR (backport #32082)
 2022-09-05 14:49:35 +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
Nabin Hait
f605564094 Merge pull request #32087 from frappe/mergify/bp/version-14-hotfix/pr-32061 
fix(Appointment): create lead notes as child table (backport #32061)
 2022-09-05 12:56:00 +05:30
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
edb100274b Merge pull request #32080 from frappe/mergify/bp/version-14-hotfix/pr-31982 
fix: upgrade process to version-14 when currency opportunity was not set (backport #31982)
 2022-09-04 22:39:01 +05:30
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
Deepesh Garg
29bca45b1e Merge pull request #32077 from frappe/mergify/bp/version-14-hotfix/pr-32045 
fix: Naming series in Journal Entry Template (backport #32045)
 2022-09-04 18:14:56 +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
Deepesh Garg
dd2fd12d5f Merge pull request #32073 from frappe/mergify/bp/version-14-hotfix/pr-31822 
fix(pos): error while consolidating pos invoices (backport #31822)
 2022-09-04 15:57:09 +05:30
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
rohitwaghchaure
78a992c086 Merge pull request #32066 from frappe/mergify/bp/version-14-hotfix/pr-32065 
fix: not able to make variant item (backport #32065)
 2022-09-03 11:53:48 +05:30
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
79ecf7751f Merge pull request #32060 from frappe/mergify/bp/version-14-hotfix/pr-32054 
fix: type error on cancellation of Process Deferred Accounting (backport #32054)
 2022-09-02 17:10:34 +05:30
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
f1b2ba5a84 Merge pull request #32058 from frappe/mergify/bp/version-14-hotfix/pr-32052 
fix: key error on consolidated financial report (backport #32052)
 2022-09-02 16:41:08 +05:30
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
84865a8421 Merge pull request #32055 from frappe/mergify/bp/version-14-hotfix/pr-31942 
fix: include payment against PO in AR/AP report (backport #31942)
 2022-09-02 14:58:25 +05:30
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
aea484be1f Merge pull request #32032 from frappe/mergify/bp/version-14-hotfix/pr-32030 
fix: Loan Interest accruals for 0 rated loans (backport #32030)
 2022-08-31 21:04:38 +05:30