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

190 Commits

Author SHA1 Message Date
Saqib Ansari
0527393b09 fix(pos): error while consolidating pos invoices 
(cherry picked from commit 33762dbbac)
 2022-09-04 07:56:06 +00:00
Deepesh Garg
4793adfefd chore: rounded total for cash and non trade discounts 2022-08-29 14:02:18 +05:30
Deepesh Garg
20e9599fc1 fix: Cash and non trade discount calculation 
(cherry picked from commit 3b15966cc9)
 2022-08-23 04:50:17 +00:00
Deepesh Garg
4a5d681c77 chore: use get instead of . operator 
(cherry picked from commit e54ec4b9b6)
 2022-07-03 08:05:23 +00:00
Deepesh Garg
fd2ec25588 feat: Cash and Non trade discounts in Sales Invoice 
(cherry picked from commit 169ff5a0dd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2022-07-03 08:05:19 +00:00
Deepesh Garg
95298f0400 fix: Use get instead of dot 2022-04-06 09:27:40 +05:30
Deepesh Garg
c0ebcfb393 fix: Do not apply shipping rule for POS transactions 2022-04-04 20:05:10 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Deepesh Garg
6a50f36b31 test: test for auto write-off amount 2022-03-25 18:02:14 +05:30
Deepesh Garg
665bd4c510 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos_write_off 2022-03-25 16:00:33 +05:30
Deepesh Garg
2e0e6ca6b1 fix: Condition 2022-03-25 12:39:59 +05:30
Deepesh Garg
6937a498e7 fix: Revert rate calculation 2022-03-25 12:28:55 +05:30
Deepesh Garg
d3fd2fd2c5 fix: Ignore for Purchase Invoices 2022-03-24 13:35:32 +05:30
Deepesh Garg
ee4258e42c fix: Write off amount wrongly calculated in POS Invoice 2022-03-24 12:31:37 +05:30
mergify[bot]
34d6031601 fix(pos): do not reset mode of payments in case of consolidation (backport #30198) (#30218) 2022-03-14 18:30:41 +05:30
Subin Tom
a1c9d1c67f fix: pos return payment mode issue (#26872) 2022-03-14 12:53:26 +05:30
Deepesh Garg
44fd94f6b2 fix: Shipping rule application fixes 
(cherry picked from commit d596e0e4df)
 2022-03-11 06:35:03 +00:00
Deepesh Garg
07db36b23d Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29940 2022-03-08 14:02:00 +05:30
Saqib Ansari
31f20cf144 fix(pos): multiple pos round off cases 
(cherry picked from commit 17445c7e04)
 2022-03-08 05:55:08 +00:00
Deepesh Garg
9af14ec0d0 fix: Test cases with discount 
(cherry picked from commit d95f8934aa)
 2022-03-08 03:39:33 +00:00
Ankush Menat
dfbd0ebf91 fix: apply margin on duplicated doc too 
(cherry picked from commit bbc4710fa3)
 2022-03-08 03:39:33 +00:00
Deepesh Garg
fd3adbb6fe fix: Item discounts for quotation 
(cherry picked from commit 3a547cb0d9)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.js
 2022-03-08 03:39:33 +00:00
Saqib Ansari
7835e86da0 fix(test): do not enable negative stock 
(cherry picked from commit 75256863c6)
 2022-02-09 11:13:04 +00:00
Saqib Ansari
e2d8fce3c5 fix(test): case if write off is calculated as negative amount 
(cherry picked from commit c2b83a0283)
 2022-02-09 11:13:04 +00:00
Saqib Ansari
32b55e715a fix(pos): incorrect grand_total in case of inclusive taxes on item 
(cherry picked from commit 0452d7de20)
 2022-02-09 11:13:03 +00:00
Deepesh Garg
d85aef5b2a Merge pull request #29188 from frappe/mergify/bp/version-13-hotfix/pr-29176 
fix: Inconsistency in calculating outstanding amount (backport #29176)
 2022-01-07 20:21:02 +05:30
Saqib Ansari
4ef9d289e8 fix(sales-invoice): cannot create debit note with zero qty 
(cherry picked from commit 04ea42ce52)
 2022-01-07 13:06:00 +00:00
Deepesh Garg
b561c18502 fix: Inconsistency in calculating outstanding amount 
(cherry picked from commit 9d3a5c3184)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-01-07 07:59:28 +00:00
Subin Tom
9e1fd09a64 fix: fixed tests, separated a method for shipping charges 
(cherry picked from commit a8e2c02e14)
 2021-11-30 09:08:16 +00:00
Subin Tom
d2d8986553 fix: check if shipping rule value exists 
(cherry picked from commit af1fce0419)
 2021-11-30 09:08:16 +00:00
Subin Tom
e6d0103cf3 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 
(cherry picked from commit 18ae03d967)
 2021-11-30 09:08:15 +00:00
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
mergify[bot]
f16e0e17cc fix: POS consolidated invoice rounded total issue (#28146) 2021-10-29 18:05:49 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Frappe PR Bot
1167a9bf94 fix: unsetting of payment if no pos profile found (#26891) 
* fix: unseting of payment if no pos profile found (#26884)

(cherry picked from commit b614834efe)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-08-10 23:18:23 +05:30
Ankush
8859574aab feat: don't recompute taxes (#26694) 2021-07-29 11:09:22 +05:30
Rohit Waghchaure
582f187726 fix: rate not able to change in purchase order 2021-06-21 00:59:02 +05:30
Ankush Menat
a9c84f749a perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +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