nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,441 Commits 638 Branches 1,812 Tags
caef140a9b515d1d25c04ede6c5baa3935667e50
Commit Graph

1774 Commits

Author SHA1 Message Date
s-aga-r
caef140a9b fix: make is_internal_supplier read-only 
(cherry picked from commit 5efbc2cbf8)
 2022-11-17 08:40:41 +00:00
mergify[bot]
4c0b5ceb9e refactor: search queries (backport #33004) (#33007) 
refactor: search queries (#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903ed7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-17 13:06:46 +05:30
Nabin Hait
eeaa9329f6 fix(ux): Tab break in Customer and Supplier form 
(cherry picked from commit fb7ee301b5)
 2022-11-10 13:01:14 +00:00
mergify[bot]
f8b7cfa6dd refactor: Remove usage of deprecated methods (backport #32914) (#32915) 
* refactor: Remove usage of deprecated methods (#32914)

Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815

(cherry picked from commit 7e1742956c)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py

* chore: conflicts

* style: black


Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-10 11:09:13 +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
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
ruthra kumar
388cf5113b test: refactor use @change_settings decorator when possible 
(cherry picked from commit 81d791eea0)
 2022-11-02 10:59:46 +00:00
Deepesh Garg
34bd7837e2 fix: Reset advance paid amount on Oreder cancel and amend 
(cherry picked from commit 92f37ca111)
 2022-10-31 16:09:27 +00:00
Deepesh Garg
953f78d6a9 fix: Add condition for discount section collapse 
(cherry picked from commit 4cd65027c4)
 2022-10-28 05:55:06 +00:00
Rohit Waghchaure
f50b485225 test: added test case to validate seachfields for customer, supplier 
(cherry picked from commit 5f84993bae)
 2022-10-24 11:42:16 +00:00
Sagar Sharma
2191f8a488 refactor: rewrite Procurement Tracker Report queries in QB 
(cherry picked from commit e78a706994)
 2022-10-18 04:37:03 +00:00
Sagar Sharma
1fbbaa8fcf refactor: rewrite Supplier Quotation Comparison Report queries in QB 
(cherry picked from commit a14b9c7bac)
 2022-10-18 04:37:02 +00:00
Sagar Sharma
fbb641936e refactor: rewrite Purchase Order Analysis Report queries in QB 
(cherry picked from commit a5b3f8cae9)
 2022-10-18 04:37:02 +00:00
Deepesh Garg
eaea8469fc fix: Party account for multi-order invoices 
(cherry picked from commit fd49503ba2)
 2022-10-15 11:29:42 +00:00
Nabin Hait
236a5f37c7 fix: minor cleanup 
(cherry picked from commit e71c417f7e)
 2022-10-11 10:33:30 +00:00
Nabin Hait
db4fbc9e58 fix: more fields reordering related to Tab Break 
(cherry picked from commit 5389a35798)
 2022-10-11 10:33:30 +00:00
Nabin Hait
22ad3ad6f3 feat: Tab Break in Supplier Quotation 
(cherry picked from commit 3d9263bf86)
 2022-10-11 10:33:29 +00:00
Nabin Hait
5a8329add1 feat: Tab Break in Purchase Order 
(cherry picked from commit 10a25603ac)
 2022-10-11 10:33:29 +00:00
Nabin Hait
31cd96bc89 feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 
(cherry picked from commit f6613e1e4c)
 2022-10-11 10:33:27 +00:00
Deepesh Garg
bda25c4d5d fix: PO cancel post advance payment cancel against PO 
(cherry picked from commit d806e32030)
 2022-10-09 13:06:06 +00:00
Sagar Sharma
9318d9a7fc Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32439 2022-10-01 14:31:49 +05:30
Sagar Sharma
11f92797b9 fix: add non-stock item filter for fg_item in PO 
(cherry picked from commit f95ed7dca2)
 2022-09-30 18:29:54 +00:00
ruthra kumar
7a096231fb chore: clean up purchase invoice and purchase invoice item 
1. remove discount accounting related fields from purchase invoice and
purchase invoice item
2. clean buying settings doctype

(cherry picked from commit 21095502b9)
 2022-09-30 10:29:17 +00:00
hendrik
931aa62072 fix: report chart field type 
* fix: report chart field type

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit f41d1500b0)
 2022-09-26 12:18:17 +00:00
Maharshi Patel
c0003195b8 fix: remove no_copy for ignore_pricing_rule 
(cherry picked from commit 8c5b420aea)
 2022-09-20 10:50:22 +00:00
Sagar Sharma
ff210c73eb fix: po_detail or sco_rm_detail not getting set while while mapping SE 
(cherry picked from commit 3a9c08e7c9)
 2022-09-19 13:49:43 +00:00
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
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
Sagar Sharma
e099e10c8e fix: test "test_pending_and_received_qty" 
(cherry picked from commit addd7347d8)
 2022-08-19 09:56:52 +00:00
mergify[bot]
74664a34c0 fix: contact search in request for quotation (backport #31828) (#31840) 
fix: contact search in request for quotation (#31828)

(cherry picked from commit e5e88bb9f1)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-15 12:19:59 +05:30
Rohit Waghchaure
0e7c4314b4 fix: minor changed link 2022-08-01 14:03:12 +05:30
Ankush Menat
67a74a4d14 fix: dont check first row on report load 
- This doesn't actually load the chart but leaves UI and data in
  inconsistent state
- On refresh it randomly keeps toggling the first row - confusing
  behaviour.
 2022-07-15 14:09:58 +05:30
Ankush Menat
ceeea6180e fix: dont override default report options in charts 
Sales analytics and purchase analytics reports are clearing the default
options which includes number shortening, axis options etc. This makes
report unreadable when dealing with large numbers.
 2022-07-15 14:09:58 +05:30
Marica
dc3d492c83 Merge branch 'develop' into rfq-email-addressing 2022-07-08 15:39:20 +05:30
marination
300e812a1f chore: Instantiate variable unconditionally 2022-07-08 15:38:44 +05:30
marination
88ac519b24 fix: Use Contact Name instead of Supplier in RFQ Email 2022-07-07 16:59:23 +05:30
Sagar Sharma
f9885746a8 Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
Sagar Sharma
6f7e67db9d chore: hide "Duplicate" button in PO 2022-07-05 08:44:35 +05:30
Sagar Sharma
687329f571 chore: update fg_item_qty based on qty in PO Item 2022-07-05 08:31:31 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Sagar Sharma
caeaa3f940 fix: multiple SCO against a PO 2022-07-02 06:20:09 +05:30
Sagar Sharma
b86710bb9a fix(ui): hide "Update Items" button based on subcontracting conditions 2022-06-30 17:28:42 +05:30
Sagar Sharma
8e4458e0e6 fix: failing test 
Removed this test case as the new POs will not have the Supplied Items table.
 2022-06-30 16:47:43 +05:30
Sagar Sharma
6589c5f5e9 Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
gn306029
2a619fd789 fix: Modify opts parameter misspell (#31476) 
Modify opts parameter misspell 

closes #31474
 2022-06-29 14:45:21 +05:30
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +05:30
Ankush Menat
dd11f26eba fix: dont update RM items table if not required (#31408) 
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.
 2022-06-27 15:55:08 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
hrzzz
8b1ff96e30 fix: translation for filter status on report 2022-06-21 15:10:19 -03:00