CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,361 Commits 416 Branches 1,718 Tags
8e00e62616559bc7db56ecfee6f7ee3ee36d4d36
Commit Graph

43361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
8e00e62616 chore: resolve merge conflicts 2022-11-07 13:31:54 +01:00
Raffael Meyer
e276a5ba83 chore: add german translations (#32846) 
Mostly for balance sheet

(cherry picked from commit d2b6490bca)

# Conflicts:
#	erpnext/translations/de.csv
 2022-11-06 04:53:21 +00:00
Deepesh Garg
1a0f123c8c Merge pull request #32859 from frappe/mergify/bp/version-14-hotfix/pr-32794 
fix: Disable tax included prices for internal transfers (backport #32794)
 2022-11-05 21:16:44 +05:30
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Deepesh Garg
41a5905a75 Merge pull request #32856 from frappe/mergify/bp/version-14-hotfix/pr-32847 
fix: Create POS Opening Entry POS Profile filter. (backport #32847)
 2022-11-05 20:51:49 +05:30
Sagar Sharma
eb6b267001 Merge pull request #32858 from frappe/mergify/bp/version-14-hotfix/pr-32850 
fix: wrong consumed items in SCR return (backport #32850)
 2022-11-05 20:12:54 +05:30
Sagar Sharma
0856e65700 test: fix test case 
(cherry picked from commit 324bfa9fde)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
3f79a057e4 fix: make BOM required in SCR Item 
(cherry picked from commit 760c26e9c0)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
bd7435ce1e test: add test case 
(cherry picked from commit 761e9df1bf)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
97445d9516 fix: rename test method 
(cherry picked from commit 611d827e0b)
 2022-11-05 11:53:49 +00:00
Sagar Sharma
e629cba2b7 fix: map BOM while mapping the return SCR 
(cherry picked from commit 54072ec9cd)
 2022-11-05 11:53:49 +00:00
Deepesh Garg
cc8a184666 Merge pull request #32855 from frappe/mergify/bp/version-14-hotfix/pr-32844 
fix: Auto advance allocation against partial invoices (backport #32844)
 2022-11-05 16:59:03 +05:30
Maharshi Patel
60af9c0516 fix: Create POS Opening Entry POS Profile filter. 
pos_profile_query was variable instead of function.

(cherry picked from commit 1328a45f2a)
 2022-11-05 11:15:32 +00:00
Deepesh Garg
c3b2629412 test: Check parital payment allocation 
(cherry picked from commit 428971f127)
 2022-11-05 10:58:42 +00:00
Deepesh Garg
b7763d953a fix: Auto advance allocation against partial invoices 
(cherry picked from commit 181df2fe63)
 2022-11-05 10:58:42 +00:00
Sagar Sharma
3bd024ca8f Merge pull request #32831 from bhavesh95863/patch-2 
fix: mysql syntax issue
 2022-11-05 11:30:14 +05:30
Sagar Sharma
d443925b1e Merge branch 'version-14-hotfix' into patch-2 2022-11-05 10:29:11 +05:30
Sagar Sharma
2f145f9912 refactor: rewrite query in QB 2022-11-05 10:28:06 +05:30
rohitwaghchaure
d9147c1975 Merge pull request #32841 from frappe/mergify/bp/version-14-hotfix/pr-32799 
fix: Scan Barcode UX (backport #32799)
 2022-11-04 12:09:36 +05:30
rohitwaghchaure
31bada9205 fix: trailing whitespace 2022-11-04 11:28:41 +05:30
rohitwaghchaure
ab87a950e5 fix: conflicts 2022-11-04 11:21:39 +05:30
Rohit Waghchaure
d8e403bf5d fix: auto increment qty if item table has no items 
(cherry picked from commit e5b19e3f70)
 2022-11-04 05:36:09 +00:00
Rohit Waghchaure
1944f4df4d fix: Scan Barcode UX 
(cherry picked from commit e1f9ba78e5)

# Conflicts:
#	erpnext/public/js/utils/barcode_scanner.js
 2022-11-04 05:36:09 +00:00
Deepesh Garg
7e15c4789d Merge pull request #32840 from frappe/mergify/bp/version-14-hotfix/pr-32712 
chore: add translation  function to Bank Reconciliation Tool-related files (backport #32712)
 2022-11-04 08:33:44 +05:30
Ernesto Ruiz
e334b7dfee chore: add translation function to Bank Reconciliation Tool related files 
chore: add translation  function to Bank Reconciliation Tool related files
(cherry picked from commit ad0dd693ac)
 2022-11-03 19:36:56 +00:00
rohitwaghchaure
2d2a126510 Merge pull request #32833 from frappe/mergify/bp/version-14-hotfix/pr-32832 
fix: not able to select customer / supplier (backport #32832)
 2022-11-03 12:22:41 +05:30
Deepesh Garg
a10ea5efc9 Merge pull request #32830 from frappe/mergify/bp/version-14-hotfix/pr-32773 
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date (backport #32773)
 2022-11-03 12:07:35 +05:30
Rohit Waghchaure
6989cdf4f2 fix: not able to select customer / supplier 
(cherry picked from commit b0fc568c80)
 2022-11-03 06:25:53 +00:00
Anand Baburajan
f5534d7db3 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32773 2022-11-03 11:53:55 +05:30
Bhavesh Maheshwari
4d9bbd4c9c fix: mysql syntax issue 2022-11-03 10:59:20 +05:30
Deepesh Garg
7a7b1d33c3 Merge pull request #32829 from frappe/mergify/bp/version-14-hotfix/pr-32713 
fix: add missing translation function on report related documents (backport #32713)
 2022-11-03 10:29:00 +05:30
anandbaburajan
01a1c96314 fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date 
(cherry picked from commit f322c608cf)
 2022-11-03 04:22:14 +00:00
Ernesto Ruiz
8f6f9a429a fix: correct linters 
(cherry picked from commit 4c7fa9482d)
 2022-11-03 04:17:23 +00:00
Ernesto Ruiz
440e20859f fix: correct linters 
(cherry picked from commit 9c529c61bb)
 2022-11-03 04:17:22 +00:00
Ernesto Ruiz
5acc9be5c9 fix: correct linters 
(cherry picked from commit b7b53b5857)
 2022-11-03 04:17:22 +00:00
Ernesto Ruiz
595aaad99d fix: add translate function to string on budget_variance_report.js to match the variance word translated 
(cherry picked from commit 2012bdf4bd)
 2022-11-03 04:17:22 +00:00
Ernesto Ruiz
16f364da37 fix: add translate function to name of chart labels in budget_variance_report.py 
(cherry picked from commit 48ed6381b3)
 2022-11-03 04:17:21 +00:00
Ernesto Ruiz
e681f06883 fix: add translate function to period in sales_analytics.py 
(cherry picked from commit 083a78135c)
 2022-11-03 04:17:21 +00:00
Ernesto Ruiz
b0c06d5a04 fix: add translate function to period in stock_analytics.py 
(cherry picked from commit c1e608d9ef)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
0ead51642f fix: refactor code for better translatable string in stock_ageing.py 
(cherry picked from commit 71a0ae2e59)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
2dc24f22ea fix: refactor code for better translatable string 
(cherry picked from commit a671652ab2)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
b8caa587d2 fix: add translate function to name of chart labels in deferred_revenue_and_expense.py 
(cherry picked from commit a963618b08)
 2022-11-03 04:17:19 +00:00
ruthra kumar
b17761c276 Merge pull request #32822 from frappe/mergify/bp/version-14-hotfix/pr-32816 
fix: update advance paid in SO/PO from Payment Ledger (backport #32816)
 2022-11-02 19:31:33 +05:30
Sagar Sharma
d8c0a147db Merge pull request #32820 from frappe/mergify/bp/version-14-hotfix/pr-32788 
fix: use `flt` instead of `cint` in `get_batch_no` (backport #32788)
 2022-11-02 19:11:08 +05:30
Sagar Sharma
611dcc11d2 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32788 2022-11-02 17:49:26 +05:30
Sagar Sharma
75d347d757 Merge pull request #32823 from frappe/mergify/bp/version-14-hotfix/pr-32800 
fix: test cases (backport #32800)
 2022-11-02 17:49:01 +05:30
Rohit Waghchaure
d3fbe3074d test: run tmate 
(cherry picked from commit 3f2728e3f7)
 2022-11-02 11:44:05 +00:00
Rohit Waghchaure
0feec4ca8a fix: test cases 
(cherry picked from commit ddd1b4be3f)
 2022-11-02 11:44:05 +00:00
ruthra kumar
cf32e1905c test: SO advance paid on Payment submission and cancellation 
(cherry picked from commit 721ac6b847)
 2022-11-02 10:59:47 +00:00
ruthra kumar
87dc812a4b test: PO advance paid on payment submission and cancellation 
(cherry picked from commit 1a0a8ac7e2)
 2022-11-02 10:59:46 +00:00