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

423 Commits

Author SHA1 Message Date
Deepesh Garg
f40c5cb681 fix: Add back calculation for discount 
(cherry picked from commit 067564bd26)
 2022-03-25 07:31:36 +00:00
Deepesh Garg
8ff47999ab fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda5776)
 2022-03-25 07:31:36 +00:00
Deepesh Garg
14ac2d39ab fix: Check if onload property exists in the form object 
(cherry picked from commit 41b2d98c3f)
 2022-03-23 08:48:17 +00:00
Deepesh Garg
c44231a432 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
(cherry picked from commit a9533ef814)
 2022-03-23 08:48:17 +00:00
Saqib Ansari
6bb1dccddd fix: merge conflicts 2022-02-25 15:45:52 +05:30
Saqib Ansari
f2264fa58d fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-02-25 10:06:21 +00:00
mergify[bot]
6539d32ca9 fix: Fetch conversion factor even if it already existed in row, on item change (#29917) (#29935) 
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases

(cherry picked from commit 235fc127b3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-22 13:01:31 +05:30
Saqib Ansari
63079f3e07 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:15 +00:00
Saqib Ansari
78c5f34286 fix: ignore pricing rule in all transactions 
(cherry picked from commit f6dda738dc)
 2022-02-09 08:02:53 +00:00
Subin Tom
c494ed087a fix: Coupon code item pricing dynamic updation issue 
(cherry picked from commit ccf63124d6)
 2022-02-08 06:20:51 +00:00
Deepesh Garg
b60fbf5ba9 fix: Add round floats for price list rate 2021-12-22 12:01:39 +05:30
Deepesh Garg
233f79bf96 fix: Recalculate taxes irrespective of price list rate changed or not 2021-12-22 11:26:19 +05:30
Deepesh Garg
0980c2f981 fix: Linting issues 2021-12-20 13:26:16 +05:30
Deepesh Garg
6087d5a603 fix(UX): Optimize rate updation of changing price list 2021-12-20 12:16:14 +05:30
Deepesh Garg
b09274bd49 Merge pull request #28641 from frappe/mergify/bp/version-13-hotfix/pr-28302 
fix: Shipping Rule picking up old net_rate (backport #28302)
 2021-12-03 15:20:09 +05:30
mergify[bot]
b6d752201a fix: actual tax conversion in case of multicurrency invoices (#28686) 2021-12-02 12:13:34 +05:30
Subin Tom
f591596615 fix: merge conflicts 2021-11-30 16:06:55 +05:30
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
mergify[bot]
15c9c08261 Merge pull request #27715 from frappe/mergify/bp/version-13-hotfix/pr-27668 
fix: Batch scans get overwritten on the same row (backport #27668)
 2021-09-30 16:34:11 +05:30
Frappe PR Bot
fbae3c7fd6 fix: apply price list after batch or serial no insertion (#27566) (#27683) 
(cherry picked from commit 72c081fd8f)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-28 12:59:45 +05:30
vama
666eaae6ce fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
 2021-09-18 13:21:45 +05:30
Frappe PR Bot
e9da4ed34d fix: manually added weight per unit reset to zero after save (#27330) (#27338) 
(cherry picked from commit 7b4a65484a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-03 22:54:49 +05:30
Frappe PR Bot
1063d85569 fix: Correct company address not getting copied from Purchase Order to Invoice (#27217) (#27235) 
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues

(cherry picked from commit fd467e6d32)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-31 20:11:21 +05:30
Frappe PR Bot
a7cdba24bc feat: coupon code discount in pos invoice (#27103) 2021-08-24 19:47:40 +05:30
Saqib
dbca11071e refactor: scan barcode field scanning (#26990) (#27076) 2021-08-23 11:23:46 +05:30
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +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
03b629c851 Merge pull request #26100 from deepeshgarg007/pi_billing_address 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 10:29:01 +05:30
Saqib
fb89008a13 fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097) 2021-06-21 10:49:09 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Deepesh Garg
a58b571ccb fix: Billing address not fetched in Purchase Invoice 2021-06-18 10:45:35 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-05-26 14:32:14 +05:30
Ankush Menat
ff96bdf0c1 fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Deepesh Garg
83f98f6992 Merge pull request #25653 from deepeshgarg007/tax_labels 
fix: Client script breaking while settings tax labels
 2021-05-10 18:24:02 +05:30
Deepesh Garg
9f0823a164 fix: Linting issues 2021-05-10 16:07:41 +05:30
Deepesh Garg
13dfb9734c fix: Lable for transaction child tables 2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf fix: Client script breaking while settings tax labels 2021-05-10 14:37:10 +05:30
Deepesh Garg
ffea9d4126 fix: Check if payment schedule exists 2021-05-05 12:28:40 +05:30
Deepesh Garg
1bb7bb74ad fix: Check if payment schedule exits before updating label 2021-05-05 12:19:57 +05:30
Deepesh Garg
04923d6a65 fix: function call to update payment schedule labels 2021-05-04 21:01:12 +05:30
Saqib
cdc99cdd49 fix(pos): incorrect expense account set in pos invoice (#25543) 2021-05-03 11:54:55 +05:30
Saqib Ansari
6fb417590f fix: sider issues 2021-04-29 14:05:20 +05:30
Saqib Ansari
c5c9f9a941 feat: set dynamic labels for payment schedule fields 2021-04-23 15:34:58 +05:30
Saqib Ansari
d552fe6778 feat: base payment amount in payment schedule 2021-04-23 14:46:52 +05:30
Marica
e8bc912ffc perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Marica
4e25aa77dd Merge branch 'develop' into dev-quality-inspection-accounts 2021-04-14 19:06:14 +05:30