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

2118 Commits

Author SHA1 Message Date
Devin Slauenwhite
3a1c923e76
fix: display currencies in validation message. 2022-06-02 14:15:50 -04:00
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes (#31215) 2022-06-01 22:01:07 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' (#31203) 2022-06-01 12:55:10 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting 2022-05-26 15:01:23 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check 2022-05-25 16:21:06 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4 feat: SCR return 2022-05-20 10:45:34 +05:30
Sagar Sharma
3469560105 refactor!: Accounts Controller 2022-05-20 10:45:33 +05:30
Sagar Sharma
34bda14b5b refactor!: Buying Controller 2022-05-20 10:45:33 +05:30
Sagar Sharma
574181f3d7 test: SubcontractingController 2022-05-20 10:45:33 +05:30
Sagar Sharma
70a1f40624 feat: New DocType "Subcontracting Receipt" 2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-05-20 10:45:33 +05:30
Sagar Sharma
249726b845 feat: New DocType "Subcontracting Order" 2022-05-20 10:45:33 +05:30
Sagar Sharma
29a1cb89c2 feat: SubcontractingController 2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692 refactor!: Make required changes to create SCO from PO 2022-05-20 10:45:30 +05:30
Saqib Ansari
f915a9cef7
fix: discount ledger entry in case of multicurrency invoice (#31024) 2022-05-17 11:22:01 +05:30
Ankush Menat
3714e36b44
fix: disable pricing rules for internal transfers (#31034) 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:09:14 +05:30
Deepesh Garg
34de20f6ee
Merge pull request #30987 from ankush/internal_transfer_with_margin 
fix: prevent bypassing forced valuation rate
 2022-05-15 20:49:55 +05:30
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs 
fix(accounts): minor fixes & validations
 2022-05-12 22:06:35 +05:30
Ankush Menat
ee0a277540 fix: prevent bypassing forced valuation rate 
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
 2022-05-12 19:01:26 +05:30
Deepesh Garg
33d9767382 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2022-05-12 16:40:29 +05:30
Saqib Ansari
a1e3ae8869 fix: user can select disabled accounts in taxes table 2022-05-11 13:01:06 +05:30
marination
0c9154389b fix: Block 0 Qty via Update Items to be consistent with form validation 2022-05-10 18:09:07 +05:30
rahib-hassan
f3fa6ac4c2 fix: account setting seperation gl discount account creation 2022-04-20 16:01:12 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
01fde15bd5 fix: dependent codes updated 2022-04-14 15:48:55 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Deepesh Garg
54eef3daad Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes 2022-04-11 15:09:30 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575 
fix: Do not apply shipping rule for POS transactions (backport #30575)
 2022-04-10 20:12:53 +05:30
Deepesh Garg
a2937cffc7 fix: Implicit ignore pricing rule check on returns 
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
 2022-04-09 14:46:25 +00:00
Deepesh Garg
9bf5f76ac8 fix: Deferred Revenue/Expense Account validation 2022-04-06 17:33:46 +05:30
Deepesh Garg
631545aa32 fix: Use get instead of dot 
(cherry picked from commit 95298f04000c0299f35cdee7bce0f5f0d8c59525)
 2022-04-06 04:31:13 +00:00
Deepesh Garg
714fc08150 fix: Do not apply shipping rule for POS transactions 
(cherry picked from commit c0ebcfb39331caa678d36cc4694490a2363f10a0)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-04-06 04:31:13 +00:00
Rohit Waghchaure
ac5df1abbe test: test case to validate rejected qty without accepted warehouse 2022-04-04 17:57:57 +05:30
Rohit Waghchaure
0a71cabab1 fix: if accepted warehouse not selected during rejection then stock ledger not created 2022-04-04 15:42:59 +05:30
Sagar Sharma
01c64915c8 chore: remove unwanted validation 2022-04-01 15:51:48 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Saqib Ansari
199a6da960 perf: skip warehouse validation for non-stock items 2022-03-31 11:41:52 +05:30
Saqib Ansari
6528218ac3 perf: skip warehouse validation for non-stock items 2022-03-29 18:43:33 +05:30
Ankush Menat
3821a97a75 Merge branch 'develop' into mergify/bp/develop/pr-30395 2022-03-28 20:14:19 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
19b1b1f4ba test: test for auto write-off amount 
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:12 +00:00
Deepesh Garg
b2ac773cca fix: Ignore for Purchase Invoices 
(cherry picked from commit d3fd2fd2c535733939ed69439301033052f45712)
 2022-03-25 15:27:11 +00:00
Deepesh Garg
f57f4af1d9 fix: Write off amount wrongly calculated in POS Invoice 
(cherry picked from commit ee4258e42c33899fae7b7add8a676274259a40e0)
 2022-03-25 15:27:10 +00:00
Deepesh Garg
97e102ceef fix: Condition 
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
 2022-03-25 07:30:41 +00:00
Deepesh Garg
a83a0a03b1 fix: Revert rate calculation 
(cherry picked from commit 6937a498e71cffc56cad65141f561b4c8785d185)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
57924599da fix: GST account not showing up in tax templates 2022-03-22 18:26:58 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation 
fix: Validate income/expense account in sales and purchase invoice
 2022-03-17 18:32:34 +05:30
Deepesh Garg
06936cf1c0 fix: Validate income/expense account in sales and purchase invoice 2022-03-16 09:02:04 +05:30
Saqib Ansari
935218598a
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12 
fix(pos): do not reset mode of payments in case of consolidation
 2022-03-14 12:34:40 +05:30
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization 2022-03-13 12:45:10 +05:30
Saqib Ansari
e8a7a54d5a fix(pos): do not reset mode of payments in case of consolidation 2022-03-12 19:20:48 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Deepesh Garg
e9d458b822 fix: Update party type 2022-03-10 12:29:17 +05:30
Deepesh Garg
395b15058c fix: Sales and Purchase retrun optimization 2022-03-10 10:50:03 +05:30
Saqib Ansari
56eb485eec
Merge pull request #30097 from nextchamp-saqib/fix-pos-round-off 
fix(pos): multiple pos round off cases
 2022-03-08 11:24:47 +05:30
Deepesh Garg
83dd3bd7fc
Merge pull request #29940 from deepeshgarg007/item_discounts_quotation 
fix: Item discounts for quotation and other docs
 2022-03-08 09:08:51 +05:30
Saqib Ansari
a13624d78b
Merge branch 'develop' into fix-pos-round-off 2022-03-07 18:24:13 +05:30
Saqib Ansari
17445c7e04 fix(pos): multiple pos round off cases 2022-03-07 18:01:07 +05:30
Ankush Menat
3638fbf06b fix: repost items with repeating item-warehouses 2022-03-02 13:11:04 +05:30
Deepesh Garg
d95f8934aa fix: Test cases with discount 2022-03-01 23:09:59 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation 2022-03-01 11:49:25 +05:30
Ankush Menat
bbc4710fa3 fix: apply margin on duplicated doc too 2022-03-01 11:48:28 +05:30
Rohit Waghchaure
39d3f20d9b fix: removed validation to check zero qty 2022-02-28 14:29:07 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes 
fix: Validate party account with company
 2022-02-23 11:22:08 +05:30
Deepesh Garg
a61790c00f fix: Remove unintended changes 2022-02-22 20:58:10 +05:30
Deepesh Garg
3a547cb0d9 fix: Item discounts for quotation 2022-02-22 16:25:32 +05:30
Rucha Mahabal
4738367d64
fix: boarding task dates not set when activity begins on is set to 0 (#29921) 2022-02-21 22:54:46 +05:30
Ankush Menat
5718777a2b fix: consider batch_no when getting incoming rate 2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise 
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
 2022-02-21 18:02:40 +05:30
Deepesh Garg
5a2b571aa9 fix: Validate party account with company 2022-02-18 20:05:49 +05:30
Ankush Menat
c36bd7e1a6 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
 2022-02-17 19:52:01 +05:30
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err 
fix(pos): incorrect grand_total in case of inclusive taxes on item
 2022-02-09 16:42:30 +05:30
Saqib Ansari
75256863c6 fix(test): do not enable negative stock 2022-02-09 16:07:33 +05:30
Saqib Ansari
ab36b27a94 fix: ignore pricing rule in all transactions 2022-02-09 10:10:17 +05:30
Saqib Ansari
c2b83a0283 fix(test): case if write off is calculated as negative amount 2022-02-08 17:36:39 +05:30
Saqib Ansari
3f962739fb Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err 2022-02-08 16:02:18 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30
Saqib Ansari
0f913e0173
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-08 11:51:26 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20 fix(pos): incorrect grand_total in case of inclusive taxes on item 2022-02-08 11:26:23 +05:30
Ankush Menat
0ca60afc3f
fix: ignore cancelled SLEs (#29679) 2022-02-08 10:24:19 +05:30
Ankush Menat
e6ab8df8f2 refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.
 2022-02-07 22:55:56 +05:30
Ankush Menat
c56d07dee3 fix: consider packed items too when reposting 2022-02-07 22:55:56 +05:30
Saqib Ansari
4655e115d0
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-07 20:04:59 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category 
feat: option to disable Item Tax Template and Tax Category
 2022-02-07 11:01:03 +05:30
Deepesh Garg
36f4fb0585 fix: Incorrect tax template in Sales Invocie via data import 
(cherry picked from commit 20f321a88980d231f52702e3d32e122022316152)
 2022-02-06 16:24:26 +00:00
Deepesh Garg
d679692472 fix: Billing status for zero amount ref doc 2022-02-06 11:35:23 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category 2022-02-04 18:10:39 +01:00
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-04 10:20:43 +05:30
Ankush Menat
551f2967da
Merge pull request #27923 from marination/e-commerce-refactor-develop 
refactor: E-commerce (port to develop)
 2022-02-03 14:14:08 +05:30
Ankush Menat
41a95e5624
fix: ignore empty customer/supplier in item query (#29610) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier
 2022-02-03 13:02:13 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 10:45:14 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch
 2022-02-01 14:42:55 +05:30
ruthra kumar
9bd56b0f79 fix: typeerror on invoice creation from SO/PO 2022-02-01 14:14:04 +05:30
rohitwaghchaure
62e5aa7d72
Merge pull request #29359 from KrithiRamani/foc_item 
fix: bypass selling price validation for free item
 2022-02-01 11:54:01 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing 
revert: "refactor!: drop e-invoicing integration from erpnext"
 2022-01-31 11:35:48 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Ankush Menat
e177c5277f fix: extend sr_no cleanup to packed items too 2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
Saqib Ansari
8a66a7ad46
Merge branch 'develop' into fix-ignore-pricing-rule 2022-01-29 12:42:00 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
marination
78b6b29a57 fix: Use get for conditionally available fields while setting missing values 
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
 2022-01-24 13:39:10 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase 2022-01-21 15:33:13 +05:30
Ankush Menat
ea5efd0791 perf: single query to update serial nos 2022-01-21 15:27:10 +05:30
Saqib Ansari
b8c41e3030 test: item price on remove pricing rule 2022-01-20 13:06:56 +05:30
Krithi Ramani
8c536ffb20 bypass selling price validation for free item 2022-01-19 15:27:09 +05:30
barredterra
f60e040d69 feat: option to disable Item Tax Template 2022-01-18 21:15:27 +01:00
Saqib Ansari
35a6b58c12 feat: purchase grouped asset 2022-01-18 13:10:23 +05:30
Marica
dbda10e092
Merge pull request #28987 from ankush/fix/srvaluation 
fix: incorrect serial no valuation
 2022-01-17 16:55:21 +05:30
Ankush Menat
8f5772463c fix: dont update sle values from get_gl_entries 2022-01-16 12:42:44 +05:30
Ankush Menat
fcc885bc16 fix: get incoming rate only if not return 2022-01-16 12:40:25 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv 
fix: Deferred revenue booking for multi currency invoices via JV
 2022-01-15 18:55:41 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults 
fix: Avoid resetting Default wh fields for Manufacture Entry
 2022-01-12 16:44:33 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Ankush Menat
33aad4b950 fix: UOM autocomplete broken 
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
 2022-01-11 17:49:30 +05:30
Deepesh Garg
30a647ff80 fix: Handle frozen books while handling 2022-01-07 19:52:38 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note 
fix: cannot create debit note with zero qty
 2022-01-07 18:35:24 +05:30
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly 
fix: Inconsistency in calculating outstanding amount
 2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po (#29134) 2022-01-04 18:39:30 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses 2021-12-29 13:45:35 +05:45
Deepesh Garg
7ad149f9fe fix: Start date validation for deferred invoices 2021-12-23 14:39:20 +05:30
Saqib Ansari
2be5104848 fix: cannot save debit note with zero quantity 2021-12-23 11:52:10 +05:30
Saqib Ansari
04ea42ce52 fix(sales-invoice): cannot create debit note with zero qty 2021-12-22 13:23:42 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-12-20 13:24:19 +05:30
Pruthvi Patel
0799f378b4 fix: consider Discounted status 2021-12-20 13:18:42 +05:30
Pruthvi Patel
6c96ed4e11 refactor: update_invoice_status with query builder 2021-12-20 13:18:42 +05:30
Deepesh Garg
a7f15a0eea Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-12-12 21:09:11 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
bb00d38dd7
Merge branch 'develop' into asset-capitalization 2021-11-30 19:32:11 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 13:15:20 +00:00
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455) 
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
 2021-11-27 15:03:35 +00:00
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
 2021-11-26 14:28:50 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Deepesh Garg
7f06c8ca57 fix: Incorrect indentation 2021-11-26 10:27:57 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
Ankush Menat
0a2964dc82 fix: ignore permissions while creating reposts 2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
 2021-11-25 16:37:19 +05:30
Ankush Menat
d220e08ba4 refactor: reuse get_items_to_be_repost function 2021-11-25 16:37:19 +05:30
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
Ankush Menat
6dc9b822bc refactor: item-wh wise reposting by default 2021-11-25 16:37:19 +05:30