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
