nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-27 13:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,404 Commits 618 Branches 1,804 Tags
e91dea62b8d98e213428f579c8a64b6602e5f53b
Commit Graph

2785 Commits

Author SHA1 Message Date
mergify[bot]
e69849d333 fix(pos): cannot change paid amount in pos payments (#30661) 2022-04-09 16:28:25 +05:30
Ankush Menat
d62928ed65 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30499 2022-04-07 19:02:47 +05:30
mergify[bot]
4a7ae5c4a7 fix: dont reassign mutable (list) to a different field (backport #30634) (#30635) 
This is an automatic backport of pull request #30634 done by [Mergify](https://mergify.com).
Conflicts fixed.
 2022-04-07 13:30:24 +00:00
ruthra kumar
39f8ee2ea6 test: added test cases for group filters 
(cherry picked from commit 16bfb930f8)
 2022-04-07 07:32:04 +00:00
ruthra kumar
a9d5000eab refactor: use group fields from Sales Order and Sales Order Items 
(cherry picked from commit b2ed9fd3fe)
 2022-04-07 07:32:03 +00:00
ruthra kumar
00acb000dc refactor: item filters are linked with group filters 
(cherry picked from commit e324d668d3)
 2022-04-07 07:32:02 +00:00
ruthra kumar
9336a3413f refactor: adding new filters and column to test cases 
(cherry picked from commit 7558f1b078)
 2022-04-07 07:32:02 +00:00
ruthra kumar
c6f946e3e8 feat: additional filters in payment terms status report 
(cherry picked from commit eaeadbc422)
 2022-04-07 07:32:01 +00:00
mergify[bot]
b524e657e2 fix(pos): do not reset search input on item selection (backport #30537) 2022-04-04 16:35:46 +05:30
rohitwaghchaure
d032a0cd77 Merge pull request #30450 from anupamvs/crm-contract-naming-v13 
feat: configurable Contract naming
 2022-04-02 23:43:02 +05:30
Saqib Ansari
9335578a0b fix: linting errors 2022-04-01 11:02:18 +05:30
Saqib Ansari
76f83ea559 fix(pos): allow validating stock on save 
(cherry picked from commit aff7408775)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2022-03-31 08:47:13 +00:00
Saqib Ansari
3b583c6c48 fix(pos): specific case when serialized item not removed 
(cherry picked from commit 4afb47e869)
 2022-03-31 08:47:11 +00:00
Saqib Ansari
a3a7dc9ce6 fix(pos): customer group filter in customer selector 
(cherry picked from commit 2f82e237ef)
 2022-03-31 08:47:10 +00:00
Saqib Ansari
bd2061d6f3 fix: prevent multiple save on applying coupon code 
(cherry picked from commit d5fd8e0ba6)
 2022-03-31 08:47:09 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
mergify[bot]
00ad515ac7 fix: use name for links not item_code (backport #30462) (#30463) 
* fix: use `name` for links not `item_code` (#30462)

(cherry picked from commit 76dce2eddc)

# Conflicts:
#	erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-29 17:16:31 +05:30
Anupam Kumar
825fea0883 Merge branch 'version-13-hotfix' into crm-contract-naming-v13 2022-03-29 12:11:57 +05:30
Anupam
1efb317243 feat: configurable Contract naming 2022-03-28 14:36:43 +05:30
Deepesh Garg
156416bcc3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into quotation_gst 2022-03-27 17:28:42 +05:30
Deepesh Garg
7cae669e81 fix(India): Auto tax fetching based on GSTIN 2022-03-23 18:47:58 +05:30
Deepesh Garg
0e3d0b0b03 fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
 2022-03-23 04:40:23 +00:00
Deepesh Garg
9f2868e858 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
 2022-03-23 04:40:22 +00:00
mergify[bot]
face53ae8e feat: Create single PL/DN from several SO. (backport #30238) (#30289) 
* feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase

(cherry picked from commit 61eb9b6c68)

* to enable selection of SO irrespective of customer,removed validation for customer

(cherry picked from commit 466df6bdb7)

* fixed spacings

(cherry picked from commit f33a725a9e)

* added new field - Picked Qty, in Sales Order Item

(cherry picked from commit a68213d82e)

* Added new field in SO - % Picked

(cherry picked from commit 9f7fee7a4f)

* removed semicolon for break statement

(cherry picked from commit e970616b51)

* as per review comments - changed for loop

(cherry picked from commit 0211f27e83)

* corrected spacing

(cherry picked from commit a12895ec03)

Co-authored-by: Krithi Ramani <krithi.ramani@gmail.com>
 2022-03-17 18:17:16 +05:30
Deepesh Garg
f27fd605f5 fix: Do not update ignore prcing rule check implicitly 
(cherry picked from commit 1f79b47a17)
 2022-03-16 07:03:16 +00:00
Deepesh Garg
b0e178a29d fix: Do not update ignore prcing rule check implicitly 
(cherry picked from commit 96b5cedcf8)
 2022-03-14 16:16:50 +00:00
Ankush Menat
1fd96f379f test(refactor): use FrappeTestCase 
(cherry picked from commit b0d1e6db54)
 2022-03-14 16:20:04 +05:30
Saqib Ansari
1cee08f3e9 fix: cannot create purchase order from sales order 
(cherry picked from commit 58804b8436)
 2022-03-14 07:05:59 +00:00
Deepesh Garg
44fd94f6b2 fix: Shipping rule application fixes 
(cherry picked from commit d596e0e4df)
 2022-03-11 06:35:03 +00:00
mergify[bot]
e3387a06b6 fix: customer credit limit validation on update (#30126) 
(cherry picked from commit a0dc79332d)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:34 +05:30
Deepesh Garg
8fc105a186 fix: Item-wise sales history report 
(cherry picked from commit e2c144e9e3)
 2022-03-09 04:48:32 +00:00
Saqib Ansari
1e418f9ecc fix: merge conflicts 2022-03-06 13:13:50 +05:30
Saqib Ansari
14f31ac2fa test: po updates packed item's ordered_qty 
(cherry picked from commit 8e3f1e306d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2022-03-06 07:40:51 +00:00
Saqib Ansari
131158a24c feat: update ordered qty for packed items 
(cherry picked from commit 8005fee656)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2022-03-06 07:40:50 +00:00
Deepesh Garg
bce4ca9390 fix: Commission not applied while making Sales Order from Quotation 
(cherry picked from commit 0373914704)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2022-02-28 07:35:04 +00:00
Saqib Ansari
f2264fa58d fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-02-25 10:06:21 +00:00
mergify[bot]
14c5be7c27 chore: Show 'Produced Qty' field in Sales Order Item (#29903) (#29904) 
(cherry picked from commit e952cce17d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-21 14:23:52 +05:30
Saqib Ansari
8d24cb44a8 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:24 +00:00
Marica
f958956322 Merge pull request #29825 from frappe/mergify/bp/version-13-hotfix/pr-29803 
fix: Update SO via Work Order made from MR (attached to SO) (backport #29803)
 2022-02-18 19:20:12 +05:30
Deepesh Garg
bdef164061 Merge pull request #29827 from frappe/mergify/bp/version-13-hotfix/pr-29137 
feat: Payment Terms Status report (backport #29137)
 2022-02-17 19:16:28 +05:30
Saqib Ansari
63079f3e07 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:15 +00:00
ruthra kumar
2ca25fc9f1 test: added test for alternate currency 
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency

(cherry picked from commit 48f37c7659)
 2022-02-16 08:46:23 +00:00
ruthra kumar
fa03246a94 test: refactor and fix failing test case 
(cherry picked from commit 49fdc6c52e)
 2022-02-16 08:46:23 +00:00
ruthra kumar
07c094152e refactor: create invoices list without if else 
(cherry picked from commit a4b8d67323)
 2022-02-16 08:46:22 +00:00
ruthra kumar
63c73e6eaf fix: default to company currency in report output 
(cherry picked from commit 85ed0fb8d6)
 2022-02-16 08:46:22 +00:00
ruthra kumar
2614de9ab3 refactor: currency field and code cleanup 
(cherry picked from commit bc244d0740)
 2022-02-16 08:46:22 +00:00
Deepesh Garg
b249478fcc fix: Copyright info 
(cherry picked from commit 4284017e9d)
 2022-02-16 08:46:21 +00:00
ruthra
b6910912a9 test: qty and rate changed to remove need for fractional Nos 
(cherry picked from commit 4535a7a301)
 2022-02-16 08:46:21 +00:00
ruthra
c6fb52a31a refactor: remove unused imports 
(cherry picked from commit edd980acdc)
 2022-02-16 08:46:21 +00:00
ruthra
408704e269 test: fix failing test case payment terms status 
(cherry picked from commit 9f1e68801d)
 2022-02-16 08:46:20 +00:00