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

1784 Commits

Author SHA1 Message Date
prssanna
b57b3c9f6c feat: hook to fetch additional print settings in print view 2020-10-22 15:37:47 +05:30
Saqib Ansari
903055b7b6 fix: '>' not supported between instances of 'str' and 'int' 2020-10-20 11:59:06 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return 2020-10-13 16:57:11 +05:30
Marica
978e16481e
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-10-12 21:17:22 +05:30
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked (#23593) 
* fix: cannot merge pos invoice if validate selling price is checked

* fix: validate selling price

* fix: test

* chore: add test

* fix: error message
 2020-10-12 18:31:23 +05:30
rohitwaghchaure
01e23264a6
Merge pull request #23557 from KanchanChauhan/issue#23475-2 
feat: Supplier Sourced Items in BOM
 2020-10-10 11:17:53 +05:30
Kanchan Chauhan
654c36ea99 feat: Supplier Sourced Items in BOM 2020-10-09 22:05:03 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:25 +05:30
marination
4be5b5c891 fix: Handle missing Account and Item in Opening Invoice Creation Tool 2020-10-08 19:51:42 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
Andy Zhu
1062d7eee0
fix: Update Items on Purchase Order 
1. set warehouse using `get_item_warehouse`
2. update "reserved_qty" for sales order
 2020-10-06 10:51:42 +13:00
Deepesh Garg
f58a5ec6a5 fix: Codition in batch selector query 2020-10-05 13:55:53 +05:30
rohitwaghchaure
ad2dd6062e
Merge pull request #23513 from deepeshgarg007/batch_search 
fix: Search batches based on search fields
 2020-10-05 13:16:03 +05:30
Deepesh Garg
1fae7749be fix: Search batches based on search fields 2020-10-05 12:38:54 +05:30
Andy Zhu
760248911d
fix: Update Items on Purchase Order 
If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated.
This fix is not mature yet but to give an tempopary solution for fixing this issue.
 2020-10-05 12:16:48 +13:00
marination
661bf64bba fix: Check only Read and Write Permission in Update Items 2020-09-29 18:16:45 +05:30
Deepesh Garg
2b38361ff5 Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote 2020-09-29 17:26:48 +05:30
Anupam
5a72022289 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal 2020-09-24 16:18:47 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Saqib
1831893b77
fix: failed workflow condition error message in update items (#23393) 2020-09-23 13:01:49 +05:30
rohitwaghchaure
27bccd7f81
Merge pull request #23397 from deepeshgarg007/search_field_batch_query 
feat: Show searchfields in batch query
 2020-09-22 16:59:24 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return 2020-09-22 15:39:25 +05:30
Deepesh Garg
a0d192eae4 feat: Show searchfields in batch query 2020-09-22 13:54:07 +05:30
prssanna
de7a2bc4be fix: apply user permissions in tax accounts query 2020-09-21 13:57:04 +05:30
Deepesh Garg
44c692ed40
Merge pull request #23278 from barry86m/patch-3 
fix: sql error on saving sales invoice without a sales order
 2020-09-20 20:40:16 +05:30
Deepesh Garg
c152b92ef4
Update erpnext/controllers/selling_controller.py 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-20 20:04:10 +05:30
Deepesh Garg
6f3d93e5a0 fix: Taxes not getting fetched from Opportunity to Quotation 2020-09-18 11:23:35 +05:30
marination
665c27af58 fix: Merge conflict missing line 2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869) 
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items (#23024) 
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-14 19:54:17 +05:30
Marica
4153a9f8de
Merge branch 'develop' into pr-dn-return 2020-09-11 16:10:48 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297) 
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
 2020-09-10 19:28:46 +05:30
Marica
52e87d1a4f
Merge branch 'develop' into pr-dn-return 2020-09-09 11:56:26 +05:30
Rucha Mahabal
f7619df8b2
fix: Lock row in subquery while setting delivered qty (#23100) 2020-09-08 11:57:45 +05:30
Marica
0411026ad6
Merge branch 'develop' into pr-dn-return 2020-09-08 10:48:44 +05:30
barry86m
fa98e81f0b
fix: sql error on saving sales invoice without a sales order 2020-09-07 01:36:15 +01:00
marination
e9274283bd fix: Raise Error on over receipt/consumption for sub-contrcated PR 2020-08-28 12:21:10 +05:30
marination
733fd5f03c fix: get_applied_pricing_rule in taxes_and_totals 2020-08-26 18:23:12 +05:30
Rushabh Mehta
ff5d19609f fix(hot): Pricing Rule encoding fixed 2020-08-25 11:59:57 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case (#23102) 2020-08-20 15:53:58 +05:30
rohitwaghchaure
5f2463933a
Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty 
feat(queries): sort warehouses based on item quantity in descending manner
 2020-08-20 09:36:16 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Diksha Jadhav
182ee5e7c1 feat(queries): sort warehouses based on item quantity 2020-08-19 14:04:34 +05:30
Nabin Hait
e2ee455acc fix: Calculate taxes if tax is based on item quantity 2020-08-12 20:58:03 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment (#22923) 
* fix: Allocated advance amount for multicurrency payment

* fix: Get grand total based on party currency

* fix: Remove unwanted code
 2020-08-11 16:06:13 +05:30
Marica
0fcb05a3aa
fix: Misleading filters on Item tax Template Link field (#22918) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 14:48:13 +05:30