schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,930 Commits 322 Branches 1,581 Tags
fb6534cb65aa0c07da0131d2271d061c7450c49a
Commit Graph

1372 Commits

Author SHA1 Message Date
Rohit Waghchaure
e523cfbb02 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 03:04:39 +05:30
Saqib
eb6fb6fffa fix: cannot auto unlink payments for credit/debit notes (#23690) 2020-10-22 16:31:55 +05:30
Marica
ab5d596959 fix: Add Taxes if missing via Update Items (#23705) 
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
 2020-10-22 16:28:41 +05:30
rohitwaghchaure
3ed333831d Merge pull request #23599 from deepeshgarg007/pos_return_amount 
fix: Mode of payment getting overwritten by defautl mode of payment for retruns
 2020-10-12 15:09:16 +05:30
Deepesh Garg
772ccde33f fix: Mode of payment getting overwritten by defautl mode of payment for returns 2020-10-12 13:32:49 +05:30
Saqib
5d7c9d2f61 fix: update items after submission ignores precision (#23492) 
* fix: update items after submission ignores precision

* chore: add test
 2020-10-09 21:19:40 +05:30
Deepesh Garg
81b47821b7 Merge pull request #23354 from deepeshgarg007/tax_fetch_quote_v12 
fix: Taxes not getting fetched from Opportunity to Quotation
 2020-10-06 19:55:38 +05:30
Deepesh Garg
54c993fb75 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into tax_fetch_quote_v12 2020-09-29 18:47:01 +05:30
marination
3fdabe75d3 fix: Check only Read and Write Permission in Update Items 2020-09-29 18:26:40 +05:30
Saqib
aad4bea366 fix: failed workflow condition error message in update items (#23392) 2020-09-23 13:01:30 +05:30
Rohit Waghchaure
b53a84b07f fix: incorrect consumed qty if raw material with batch 2020-09-22 10:36:52 +05:30
Deepesh Garg
31a887f045 fix: Taxes not getting fetched from Opportunity to Quotation 2020-09-18 11:32:57 +05:30
marination
526814c041 fix: Fetch and set Item Tax Template via Update Items 2020-09-16 10:28:33 +05:30
rohitwaghchaure
bea5e5b1bc fix: consumed qty logic for subcontracted raw materials (#23314) 
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
 2020-09-15 19:40:37 +05:30
rohitwaghchaure
bb905ca4b0 fix: incorrect calculation for consumed qty for subcontract item (#23257) 
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
 2020-09-14 21:12:16 +05:30
Saqib
1e981b50d5 Update items with workflow v12 (#23324) 
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items
 2020-09-14 19:53:52 +05:30
rohitwaghchaure
8e21738238 Merge pull request #23192 from marination/batch-source-reference 
fix: Unlink and delete batch created from stock reco on cancel
 2020-09-08 12:12:30 +05:30
Rucha Mahabal
5096639591 fix: Lock row in subquery while setting delivered qty (#23101) 2020-09-08 11:58:07 +05:30
Marica
7c963a03cb Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-03 18:01:09 +05:30
marination
c407bb2385 fix: Misleading filters on Item tax Template Link field 2020-09-03 16:54:43 +05:30
marination
5c1f11e561 fix: Raise Error on over receipt/consumption for sub-contrcated PR 2020-09-03 15:47:38 +05:30
Marica
1dbffa6ccc Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-02 20:24:07 +05:30
rohitwaghchaure
a0099a3c63 Merge pull request #23124 from ruchamahabal/fix-pos-return 
fix: Update paid amount for pos return (#20543)
 2020-09-02 12:16:25 +05:30
rohitwaghchaure
89d1990d79 Merge pull request #23179 from marination/pricing-rule-missing-fix-version-12-hotfix 
fix: Pricing rule encoding missing line
 2020-08-28 10:36:24 +05:30
marination
eab2d25c6a fix: Unlink and delete batch created from stock reco on cancel 2020-08-27 20:34:51 +05:30
marination
4cce4a7712 fix: get_applied_pricing_rule in taxes_and_totals 2020-08-26 20:18:37 +05:30
Rohit Waghchaure
d223d4b829 fix(hot): Pricing Rule encoding fixed 2020-08-25 16:18:44 +05:30
Deepesh Garg
9b4cc0b6e9 fix: Update paid amount for pos return (#20543) 
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
 2020-08-24 15:01:57 +05:30
Rohit Waghchaure
5e32ee8457 fix: not able to submit delivery note 2020-08-20 12:21:09 +05:30
Suraj Shetty
bf7adb8b38 refactor: Format and sanitise user inputs to search queries. (#23064) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 11:17:30 +05:30
Nabin Hait
af9d653fb4 Inclusive tax based on item quantity v12 (#23015) 
* fix: Calculate taxes if tax is based on item quantity and inclusive on item price

* git commit -m "fix: Add missing semicolon"

* fix: Calculate taxes if tax is based on item quantity

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-08-13 09:22:05 +05:30
Deepesh Garg
a979fcc25b fix: Project link not set in accounts other than profit and loss accounts (#22049) 
* fix: project link not set in accounts other than profilt and loss accounts

* fix: cannot find get_allow_cost_center_in_entry_of_bs_account

* fix: remove enable_allow_cost_center_in_entry_of_bs_account

* chore: add tests and remove test based on allow_cost_center_for_bs_accounts

* fix: travis

* fix: Test Cases

* fix: Patch to remove Property Setter

* fix: Test Cases

* fix: Remove v13 patch

* fix: Procurement Tracker test case

* fix: Proccurement tracker report test

* fix: Codacy

* fix: Remove duplicate project field

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-08-12 21:06:25 +05:30
Deepesh Garg
7d262d1a08 Merge pull request #22928 from deepeshgarg007/paymemnt_reco_multi_v12 
fix: Multi currency payment reconciliation
 2020-08-07 15:36:37 +05:30
Deepesh Garg
b3cdd91d65 fix: Tests 2020-08-06 13:18:42 +05:30
Deepesh Garg
e6ec549c81 fix: Multi currency payment reconciliation 2020-08-06 11:30:46 +05:30
rohitwaghchaure
6a48988c76 fix: incorrect stock value in return case (#22528) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:46:55 +05:30
Deepesh Garg
e077c0a270 fix: Randomly failing test (#22773) 
* fix(travis): Item Tax tempate template test

* fix: Update tests

* fix: Test

* fix: Do not use random customers

* fix: Remove every bit of randomness from this test
 2020-07-22 16:12:12 +05:30
Chinmay D. Pai
75c2e28788 fix: whitelist all query functions for search widget 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-07 16:46:04 +05:30
mergify[bot]
6089023df7 fix: grammatical fix on error message (#22464) 
Before:

Fiscal Year: 2020 does not exists

After:

Fiscal Year 2020 Does Not Exist

(cherry picked from commit 978722621f)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-06-26 09:23:36 +05:30
Marica
fb18f78b77 fix: Update Packed Items via Update Items in SO (#22404) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-23 19:19:08 +05:30
Marica
06ca3b5112 Purchase receipt to invoice hotfix (#22146) 
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

* fix: Set Purchase Receipt and Delivery Note detail patch (#21607)

* fix: Set Purchase Receipt and Delievry Note detail patch

* fix: Reload purchase receipt item

* fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-22 18:04:48 +05:30
Rohit Waghchaure
c75236579f fix: incorrect variable used while adding items in the submitted sales order 2020-06-18 13:59:23 +05:30
marination
e67195b0b9 fix: Typo 2020-06-17 19:06:56 +05:30
marination
17ec1d6b28 fix: Message Formatting 2020-06-17 13:46:21 +05:30
marination
b819d8cdb6 fix: Wrong key sent to gte_valuation_rate 2020-06-15 14:47:37 +05:30
rohitwaghchaure
db48fc2559 Merge pull request #22218 from marination/update-items-permission-fix-hotfix 
fix: submitted sales order can be updated with no permission
 2020-06-15 13:10:15 +05:30
marination
713cbcea44 fix: Travis 2020-06-15 12:09:04 +05:30
marination
f6054a2de8 fix: Added PO test and conversion factor fix 
- Don't change conversion factor if stock uom and uom is the same
- Added PO test
- Added Accounts User basic role in PO
- Minor fixes, wrong variables
 2020-06-12 16:28:44 +05:30
Saqib Ansari
9ee4841520 fix: cannot update delivery date 2020-06-12 16:25:38 +05:30
Saqib Ansari
37b614af0e fix: submitted sales order can be updated with no permission 2020-06-12 16:25:07 +05:30