Commit Graph

171 Commits

Author SHA1 Message Date
ruthra kumar
198830a6c8 fix: enclose ternary operator in parentheses
(cherry picked from commit 986daa6578)
2023-03-31 08:02:11 +00:00
mergify[bot]
19dda807d1 fix(client): Amount calculation for 0 qty debit notes (#34455)
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>
(cherry picked from commit ee6c107d58)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-21 16:06:10 +05:30
ruthra kumar
f6607a6050 fix: pos return throwing amount greater than grand total
(cherry picked from commit 35c70f39fa)
2023-02-28 12:53:30 +00:00
mergify[bot]
2408966090 fix: Amount for debit and credit notes with 0 qty line items (backport #33902) (#34123)
fix: Amount for debit and credit notes with 0 qty line items (#33902)

(cherry picked from commit 47c91324b1)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-02-19 11:37:44 +05:30
barredterra
fc4be1b337 fix: missing constant definition
(cherry picked from commit 547d37b1db)
2023-01-21 16:59:37 +00:00
mergify[bot]
d6504320b1 fix: calculate correct amount for qty == 0 (backport #33739) (#33752)
fix: calculate correct amount for qty == 0 (#33739)

(cherry picked from commit 327b6fdb32)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-01-20 23:38:37 +05:30
Deepesh Garg
6a9d13ff28 chore: Linting issues
(cherry picked from commit 1cb7ae16ab)
2022-08-23 04:50:19 +00:00
Deepesh Garg
20e9599fc1 fix: Cash and non trade discount calculation
(cherry picked from commit 3b15966cc9)
2022-08-23 04:50:17 +00:00
mergify[bot]
98eb7da06a fix(pos): paid amount calculation for multicurrency invoice (#31122) 2022-05-25 12:24:09 +05:30
Deepesh Garg
c0ebcfb393 fix: Do not apply shipping rule for POS transactions 2022-04-04 20:05:10 +05:30
Deepesh Garg
a044e92687 fix: Incorrect default amount to pay for POS invoices 2022-03-27 13:02:31 +05:30
Deepesh Garg
6a50f36b31 test: test for auto write-off amount 2022-03-25 18:02:14 +05:30
Deepesh Garg
ed38679d22 fix: Ignore for Purchase Invoices 2022-03-24 13:09:55 +05:30
Deepesh Garg
2e33e748ea fix: Client side changes for POS Write off amount 2022-03-24 12:56:22 +05:30
Deepesh Garg
7cba4975ef fix: Taxes not getting fetched from item tax template 2022-03-21 21:28:41 +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
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
9b6c2fdfb7 fix: Conflicts 2022-01-07 15:03:55 +05:30
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
f591596615 fix: merge conflicts 2021-11-30 16:06:55 +05:30
Subin Tom
facaa9cc39 fix: sider issues
(cherry picked from commit e7b4204c35)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
2021-11-30 09:08:17 +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
e65a720810 fix: Shipping Rule picking up old net_rate
(cherry picked from commit c78b8b7897)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
#	erpnext/public/js/controllers/transaction.js
2021-11-30 09:08:15 +00:00
Ankush Menat
8fffd1597d fix: dont recompute item wise taxes from front end
(cherry picked from commit 393749a611)
2021-10-20 19:44:26 +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
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
Deepesh Garg
991d3cdd76 fix: Incorrect discount amount on amended document 2021-07-01 21:17:17 +05:30
Deepesh Garg
1658107a92 fix: Linting fixes 2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d fix: Add python 3 compatible string types 2021-06-24 19:17:58 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +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
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +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
Afshan
d95b59e90c fix: call function when arguments available 2021-03-08 18:19:53 +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
Afshan
ee87484134 fix: calculated discount percentage (#24510)
* fix: calculated discount percentage

* fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 20:11:58 +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
Saqib
60212ff9b9 fix: multiple pos issues (#23347)
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
Marica
65c2c4f85f Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Saqib
cd89994b33 fix: multiple pos issues (#23297)
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
marination
22d3729427 fix: Codacy 2020-08-19 15:42:40 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Deepesh Garg
7d0a625b9c git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Saqib
a6f98d48bc refactor: POS workflow (#20789)
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30