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
Saqib Ansari
17445c7e04
fix(pos): multiple pos round off cases
2022-03-07 18:01:07 +05:30
Deepesh Garg
d95f8934aa
fix: Test cases with discount
2022-03-01 23:09:59 +05:30
Ankush Menat
bbc4710fa3
fix: apply margin on duplicated doc too
2022-03-01 11:48:28 +05:30
Deepesh Garg
3a547cb0d9
fix: Item discounts for quotation
2022-02-22 16:25:32 +05:30
Saqib Ansari
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +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
0452d7de20
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-08 11:26:23 +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
9d3a5c3184
fix: Inconsistency in calculating outstanding amount
2022-01-06 18:58:49 +05:30
Saqib Ansari
04ea42ce52
fix(sales-invoice): cannot create debit note with zero qty
2021-12-22 13:23:42 +05:30
Subin Tom
a8e2c02e14
fix: fixed tests, separated a method for shipping charges
2021-11-16 19:06:49 +05:30
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error
2021-11-15 20:34:05 +05:30
Subin Tom
af1fce0419
fix: check if shipping rule value exists
2021-11-10 16:49:12 +05:30
Subin Tom
18ae03d967
fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py
2021-11-10 15:57:41 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue ( #28006 )
2021-10-29 16:45:04 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found ( #26884 )
2021-08-10 21:33:58 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes
2021-07-27 14:49:44 +05:30
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
...
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Deepesh Garg
18be767f75
fix: Remove invalid test
2021-06-06 13:25:34 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
Deepesh Garg
84f270e732
fix: Remove unwanted commits
2021-05-25 18:03:42 +05:30
Deepesh Garg
d18dde7757
fix: Add tds in PO and code cleanup
2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613
fix: TDS against Purhase Orders
2021-05-25 17:25:13 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount ( #25188 )
...
* fix: Round off final tax amount instead of current tax amount
* fix: Syntax error
* fix: Indentation
* fix: Round Off taxes order execution
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 11:20:27 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice ( #25029 )
...
* fix: Item wise tax rate for consolidated POS invoice
* fix: Do not alter item wise taxes for consolidated invoices
* fix: Add test case
* fix: Update
* fix: Set opening stock for test item
* fix: Add valuation rate for opening stock
2021-04-12 10:56:47 +05:30
Walstan Baptista
37b826b988
fix: correct calculation for discount amount when margin is set ( #25179 )
2021-04-03 19:48:46 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
...
feat: recursive pricing rule
2021-03-26 19:10:10 +05:30
Rohit Waghchaure
ff70e61d7a
feat: recursive product discount
2021-03-17 14:30:34 +05:30
Deepesh Garg
22f5ff8492
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-17 10:56:52 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes ( #24488 )
...
* feat: Normal rounding for GST Taxes
* fix: Add test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Rohit Waghchaure
d4d639c7ed
fix: test cases for pricing rule
2021-02-01 23:01:18 +05:30
rohitwaghchaure
bf7317d4e2
fix: multiple pricing rule issue ( #24509 )
2021-02-01 20:22:14 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Deepesh Garg
bfc17e487c
fix: Commonify code for Stock Entry
2020-12-25 18:34:39 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
Rucha Mahabal
edee530d4c
fix: paid amount in Sales Invoice POS return resets to 0
2020-12-04 12:13:26 +05:30
Rohit Waghchaure
a248dfb9a5
fix: multiple pricing rules are not working on selling side
2020-10-28 16:22:49 +05:30
