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

199 Commits

Author SHA1 Message Date
Deepesh Garg
ee6c107d58
fix(client): Amount calculation for 0 qty debit notes (#34455) 
fix(client): Amount calculaton for 0 qty debit notes

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-21 15:38:39 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation 
feat: Support for Alternative Items in Quotation
 2023-03-01 17:41:24 +05:30
ruthra kumar
35c70f39fa fix: pos return throwing amount greater than grand total 2023-02-28 16:21:32 +05:30
Marica
22010b745c
Merge branch 'develop' into alternative-items-quotation 2023-02-15 13:05:33 +05:30
Deepesh Garg
47c91324b1
fix: Amount for debit and credit notes with 0 qty line items (#33902) 2023-02-11 09:04:00 +05:30
marination
cef7dfd0b4 feat: Dialog to select alternative item before creating Sales order 
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
 2023-01-26 14:36:25 +05:30
marination
f19eadab9a feat: Consider filtered items table in JS for totals computation 
- Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API
- Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows
 2023-01-25 13:10:03 +05:30
barredterra
547d37b1db fix: missing constant definition 2023-01-21 17:29:43 +01:00
Raffael Meyer
327b6fdb32
fix: calculate correct amount for qty == 0 (#33739) 2023-01-20 19:35:27 +05:30
Sabu Siyad
7d64bf78cf
fix(pos): variable typo: s_pos -> is_pos 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-12 19:09:00 +05:30
Sabu Siyad
c5edbe2e2f
fix(lint): trailing whitespace 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-30 17:12:06 +05:30
Sabu Siyad
a378619c9a
fix(pos): partial return amount update 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-23 17:52:12 +05:30
Deepesh Garg
1cb7ae16ab chore: Linting issues 2022-08-23 09:12:20 +05:30
Deepesh Garg
3b15966cc9 fix: Cash and non trade discount calculation 2022-08-21 17:51:05 +05:30
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice (#31112) 2022-05-25 11:40:49 +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
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438 2022-04-09 20:03:23 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts 2022-04-09 19:53:40 +05:30
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
Deepesh Garg
33fa14b6cf
fix: Resolve conflicts 2022-03-27 19:23:53 +05:30
Deepesh Garg
18c5b24ac1 fix: Update condition 2022-03-27 19:20:37 +05:30
Deepesh Garg
fc09377de2 fix: Resolve conflicts 2022-03-27 19:18:32 +05:30
Deepesh Garg
485e6b6a09 fix: Incorrect default amount to pay for POS invoices 
(cherry picked from commit a044e9268786b3395f2e33fd5b79e64bc60160a5)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-27 12:31:36 +00:00
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
8cfa3a9ece fix: Ignore for Purchase Invoices 
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5 fix: Client side changes for POS Write off amount 
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:10 +00:00
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +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
e7b4204c35 fix: sider issues 2021-11-16 20:39:58 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Subin Tom
c78b8b7897 fix: Shipping Rule picking up old net_rate 2021-11-09 14:46:45 +05:30
Ankush Menat
393749a611
fix: dont recompute item wise taxes from front end 2021-10-19 14:13:34 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +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
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
Subin Tom
793063bf4e
fix: pos return payment mode issue (#26875) 2021-08-10 15:57:30 +05:30
Deepesh Garg
8d52a22709
fix: Additional discount calculations in Invoices (#26553) 
* fix: Additional discount calculations in Invoices

* revert: Client side handling for Dynamic GST Rates

* fix: Add update item tax template method back

* fix: Revert refresh field

* fix: add company change trigger
 2021-07-26 19:00:57 +05:30
Anurag0911
4128aa7628
fix: syntax error (#26610) 
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
 2021-07-23 16:52:42 +05:30
Nabin Hait
595c7a6e61 fix: merge conflict 2021-07-22 17:11:20 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release 
fix: Additional discount calculations in Invoices
 2021-07-22 11:30:47 +05:30
Deepesh Garg
9fa92c912b fix: Revert refresh field 2021-07-21 23:18:17 +05:30
Deepesh Garg
50b188214d revert: Client side handling for Dynamic GST Rates 2021-07-21 23:18:17 +05:30
Deepesh Garg
f9da88cb15 fix: Additional discount calculations in Invoices 2021-07-21 23:17:56 +05:30
Deepesh Garg
07d9f3f74b fix: Incorrect discount amount on amended document 2021-07-13 15:35:59 +05:30
Deepesh Garg
4ff98cc171 fix: Incorrect discount amount on amended document 2021-07-12 11:27:28 +05:30
Deepesh Garg
991d3cdd76 fix: Incorrect discount amount on amended document 2021-07-01 21:17:17 +05:30
Deepesh Garg
7b7796c1ed fix: Linting fixes 2021-06-24 21:13:18 +05:30