CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 19:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,796 Commits 424 Branches 1,724 Tags
abd3aee5b518bb0d9001dc457804b45e0930e54b
Commit Graph

37796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
abd3aee5b5 chore: change log for version 13.11.0 (#27527) 2021-09-15 21:06:13 +05:30
Frappe PR Bot
6d2d97bac4 fix(minor): Remove b2c limit check from CDNR Invoices (#27516) (#27519) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format

(cherry picked from commit 978028c880)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 19:11:28 +05:30
Frappe PR Bot
05663268e6 feat: provision to add scrap item in job card (#27483) (#27518) 
(cherry picked from commit c5a77f60ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 18:15:38 +05:30
Frappe PR Bot
d1a4761955 fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27477) 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive

(cherry picked from commit 10754831c3)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-15 17:08:41 +05:30
Marica
9adb4c8b69 Merge pull request #27509 from frappe-pr-bot/backport/version-13-pre-release/27508 
fix: Shopping Cart and Variant Selection
 2021-09-15 14:17:53 +05:30
Marica
0572c0ae3e Merge pull request #27508 from marination/shopping-cart-fixes 
fix: Shopping Cart and Variant Selection
(cherry picked from commit 9e0fb74ab2)
 2021-09-15 08:31:20 +00:00
Frappe PR Bot
397fad7eb2 fix: Values with same account and different account number in consolidated balance sheet report (#27493) (#27503) 
(cherry picked from commit 625626b973)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 11:49:04 +05:30
Frappe PR Bot
2ae48eeac8 fix: Patch for updating tax withholding category dates (#27489) (#27494) 
(cherry picked from commit c53b78e712)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 10:29:50 +05:30
Frappe PR Bot
9659acb31e fix: calculate operating cost based on BOM Quantity (#27464) (#27500) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases

(cherry picked from commit 2e2985e4f1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 01:19:15 +05:30
Marica
a3d64c6cb9 Merge pull request #27490 from frappe-pr-bot/backport/version-13-pre-release/27488 
fix: Args missing error on changing Price List currency with cart enabled
 2021-09-14 19:12:04 +05:30
Marica
52157cc000 Merge pull request #27488 from marination/validate-cart-settings 
fix: Args missing error on changing Price List currency with cart enabled
(cherry picked from commit 2a9fbc609d)
 2021-09-14 13:14:20 +00:00
Marica
e6771f43a7 Merge pull request #27487 from frappe-pr-bot/backport/version-13-pre-release/27486 
fix: Handle Excess/Multiple Item Transfer against Job Card
 2021-09-14 18:25:02 +05:30
Marica
cf2d1681d8 Merge pull request #27486 from marination/job-card-excess-transfer-hotfix 
fix: Handle Excess/Multiple Item Transfer against Job Card
(cherry picked from commit d76e5dcb93)
 2021-09-14 12:31:06 +00:00
Frappe PR Bot
3c3f0adbd9 Merge pull request #27481 from deepeshgarg007/gstin_filter_issue_v13 (#27484) 
fix: GSTR-1 Reports not showing any data
(cherry picked from commit d5f4160260)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-14 17:35:02 +05:30
Deepesh Garg
7112c6b9d3 Merge pull request #27476 from deepeshgarg007/tds_dates_v13 
feat: Validity dates in Tax Withholding Rates
 2021-09-14 16:14:36 +05:30
Deepesh Garg
e8411e8bc2 fix: Update fiscal year 2021-09-14 15:32:12 +05:30
Deepesh Garg
a3db15ccb7 fix: Linting Issues 2021-09-14 12:54:18 +05:30
Deepesh Garg
9fda447dd9 fix: Test Case 2021-09-14 12:54:18 +05:30
Deepesh Garg
0b296e2190 fix: Hardcode fiscal year and posting date 2021-09-14 12:29:00 +05:30
Deepesh Garg
c161daa4be fix: Debug CI 2021-09-14 12:29:00 +05:30
Deepesh Garg
1fa4962723 test: Update test case 2021-09-14 12:28:41 +05:30
Deepesh Garg
9c35e3aa89 fix: Linting and patch fixes 2021-09-14 12:28:41 +05:30
Deepesh Garg
86220e9ed6 fix: Advance TDS test case 2021-09-14 12:28:41 +05:30
Deepesh Garg
b86454e7f4 feat: Validity dates in Tax Withholding Rates 2021-09-14 12:28:36 +05:30
Frappe PR Bot
3887a67f7e fix: editable price list rate field in sales transactions (#27455) (#27460) 
(cherry picked from commit a5baf909b7)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-13 18:48:32 +05:30
Frappe PR Bot
dc5f7a0c09 fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27454) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349)

* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test

(cherry picked from commit bab644a249)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts in test file

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-13 15:14:28 +05:30
Saqib
72d1cf0537 feat: (get_items_from) filter material request item in purchase order (#27452) 2021-09-13 14:01:39 +05:30
Frappe PR Bot
e39db1abe3 revert: "fix: Salary component account filter (#26605)" (#27446) (#27447) 
This reverts commit aaea5edbdb.

(cherry picked from commit 5c1f0c98f8)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-13 10:33:28 +05:30
Ankush Menat
71e4230ab0 chore: whitespace/imports 2021-09-13 10:31:00 +05:30
rohitwaghchaure
75e108ab81 Merge pull request #27423 from rohitwaghchaure/merge-hotfix-to-pre-release-v13-11-0 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' for v13.11.0
 2021-09-10 14:17:12 +05:30
Rohit Waghchaure
135e3b0f09 fix: sider issues 2021-09-10 13:00:30 +05:30
Rohit Waghchaure
c25bc3403d Merge branch 'version-13-hotfix' into merge-hotfix-to-pre-release-v13-11-0 2021-09-10 12:41:54 +05:30
Frappe PR Bot
3b7e981ccd fix: fetch customers and billing email in PSOA (#27418) 2021-09-09 21:31:16 +05:30
Saqib
3cac39c584 fix: pos payment mode selection issue (#27409) (#27417) 2021-09-09 19:36:01 +05:30
Ankush Menat
a6a564c43d chore: whitespace (#27416) 2021-09-09 19:16:21 +05:30
Frappe PR Bot
0950e246c3 refactor: .doc missing and empty row on new doc (#27408) (#27414) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const

(cherry picked from commit acdb10377f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-09 19:13:06 +05:30
Marica
ef4b1dba26 Merge pull request #27401 from deepeshgarg007/website_item_patch 
fix: Website item patch fixes
 2021-09-09 16:57:11 +05:30
Frappe PR Bot
b1eb0c5c75 fix: added Show Remarks checkbox in AR & AP reports (#27374) (#27404) 
(cherry picked from commit 3576668638)

Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
 2021-09-09 14:26:31 +05:30
Deepesh Garg
064ce90e8c Merge pull request #27261 from frappe-pr-bot/backport/version-13-hotfix/27143 
feat: Taxjar Integration update
 2021-09-09 13:16:01 +05:30
Frappe PR Bot
5126b3f93e fix: job card overlap unknown column jc.employee (#27403) (#27405) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f8ac)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-09 12:45:25 +05:30
Frappe PR Bot
81dbf1ed00 fix: added delivery date filters to get sales orders in production plan (#27367) (#27397) 
(cherry picked from commit 295020451f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-09 12:20:49 +05:30
Deepesh Garg
70c5533646 fix: Website item patch fixes 2021-09-09 09:47:18 +05:30
Frappe PR Bot
fea6291399 fix: document naming rule not working for subscription invoices (#27395) 2021-09-08 19:11:47 +05:30
Subin Tom
47c548a070 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27143 2021-09-08 17:20:20 +05:30
Frappe PR Bot
2d3c036070 fix: auto complete sales order rows in production plan (#27352) (#27396) 
* fix: auto complete sales order rows in production plan

* fix: sider

(cherry picked from commit 81d3524d27)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-08 16:52:43 +05:30
Frappe PR Bot
30e02f092d fix: General Ledger translation issues (#27298) (#27392) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit fa819f2fb0)
 2021-09-08 16:41:41 +05:30
Frappe PR Bot
67174ef1b3 fix: scan barcode fields input length (#27390) 
* fix: scan barcode fields input length (#27389)

* fix: undo unintentional changes

* fix: scan barcode fields input length

* fix: undo barcode field length change

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>

(cherry picked from commit df3e4ce1c0)
 2021-09-08 16:22:35 +05:30
Saqib
d7e7a5519a fix(SLA): select options for 'Pause SLA On' (#27376) 2021-09-07 18:45:26 +05:30
Marica
4727bf5806 Merge pull request #27381 from frappe-pr-bot/backport/version-13-hotfix/27358 
fix: Check if Item is serialised before trying to fetch SN and set SO in it
 2021-09-07 15:11:53 +05:30
Marica
29e0d315db Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27358 2021-09-07 15:01:13 +05:30