Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,590 Commits 3 Branches 0 Tags 1 GiB
b88d5d135e
Commit Graph

2906 Commits

Author SHA1 Message Date
Devin Slauenwhite
b88d5d135e fix(test): validate exception without website item 2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe test: assert error if quotation contains non website item 2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4 fix: shopping cart quotation without website item 2022-04-22 16:22:32 +05:30
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
Deepesh Garg
5cdd0d6719 fix: Move tax withholding category field 2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408 test: Sales order analysis report 2022-04-16 12:02:32 +05:30
ruthra kumar
e28e6726f1 fix: SO analysis rpt will fetch SO's without Delivery note as well 2022-04-14 18:37:46 +05:30
Ankush Menat
c3e1f0e369 refactor: ignore mandatory fields during setup 2022-04-11 13:19:17 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments (#30660) 2022-04-09 16:28:10 +05:30
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation (#30637) 2022-04-07 21:40:03 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Deepesh Garg
f3e6a26d34
Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter 
feat: 'customer' column and more filter to Payment terms status report
 2022-04-07 13:01:16 +05:30
Ankush Menat
ba42c87687
refactor: don't use pandas for basic reports (#30597) 2022-04-06 15:40:41 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30
ruthra kumar
16bfb930f8 test: added test cases for group filters 2022-04-05 11:08:09 +05:30
ruthra kumar
b2ed9fd3fe refactor: use group fields from Sales Order and Sales Order Items 2022-04-04 17:00:47 +05:30
Saqib Ansari
fed66038b5
fix(pos): do not reset search input on item selection (#30537) 2022-04-04 15:59:16 +05:30
ruthra kumar
e324d668d3 refactor: item filters are linked with group filters 2022-04-04 14:52:19 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Deepesh Garg
c58fde2fb2 fix: Add competitor field back 2022-04-02 20:03:46 +05:30
Deepesh Garg
485f5cfdfe fix: Resolve conflicts 2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385 2022-04-02 17:24:19 +05:30
Ankush Menat
47f27a5171 refactor: move scan api to stock utils; add item_info 2022-04-01 21:11:03 +05:30
Ankush Menat
767b827b59 feat: return batch code while scanning serial no 2022-04-01 21:11:03 +05:30
ruthra kumar
7558f1b078 refactor: adding new filters and column to test cases 2022-03-30 18:50:18 +05:30
ruthra kumar
eaeadbc422 feat: additional filters in payment terms status report 2022-03-30 18:50:13 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code (#30462) 2022-03-29 11:21:03 +05:30
Deepesh Garg
03952f8819 fix(India): Auto tax fetching based on GSTIN 
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
#	erpnext/selling/doctype/quotation/quotation.json
 2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Saqib Ansari
aff7408775 fix(pos): allow validating stock on save 2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869 fix(pos): specific case when serialized item not removed 2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef fix(pos): customer group filter in customer selector 2022-03-21 12:47:35 +05:30
Saqib Ansari
d5fd8e0ba6 fix: prevent multiple save on applying coupon code 2022-03-21 11:36:30 +05:30
barredterra
36df21067c refactor: sales analytics 2022-03-20 03:58:24 +01:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN 
feat: Create single PL/DN from several SO.
 2022-03-17 15:39:45 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 
fix: Do not update ignore pricing rule check implicitly
 2022-03-16 12:32:25 +05:30
Deepesh Garg
1f79b47a17 fix: Do not update ignore prcing rule check implicitly 2022-03-16 11:55:43 +05:30
Krithi Ramani
9f7fee7a4f Added new field in SO - % Picked 2022-03-15 21:40:51 +05:30
Krithi Ramani
a68213d82e added new field - Picked Qty, in Sales Order Item 2022-03-15 20:18:23 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable 2022-03-14 15:49:21 +05:30
Saqib Ansari
f5f6650779
Merge pull request #30217 from nextchamp-saqib/fix-so-to-po 
fix: cannot create purchase order from sales order
 2022-03-14 12:35:32 +05:30
Saqib Ansari
58804b8436 fix: cannot create purchase order from sales order 2022-03-14 12:31:13 +05:30
Deepesh Garg
96b5cedcf8 fix: Do not update ignore prcing rule check implicitly 2022-03-13 17:48:37 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Saqib Ansari
baee5d109e
Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update 
fix: customer credit limit validation on update
 2022-03-09 11:42:14 +05:30