Commit Graph

40675 Commits

Author SHA1 Message Date
Marica
1e34616c91 Merge pull request #31393 from frappe/mergify/bp/version-13-hotfix/pr-30837
fix: Respect system precision for user facing balance qty values (backport #30837)
2022-06-21 20:13:23 +05:30
Deepesh Garg
e43e442448 Merge pull request #31413 from frappe/mergify/bp/version-13-hotfix/pr-31264
fix: internal transfer GLE validation (backport #31264)
2022-06-21 14:56:56 +05:30
Ankush Menat
8a4cd2aba1 fix: internal transfer GLE validation
(cherry picked from commit 65b21ee7d6)
2022-06-21 09:02:02 +00:00
Marica
3f4d00d288 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30837 2022-06-21 11:02:46 +05:30
Deepesh Garg
8b3fc15ca8 Merge pull request #31397 from frappe/mergify/bp/version-13-hotfix/pr-31396
fix: Quotation lost update (backport #31396)
2022-06-21 10:28:45 +05:30
Deepesh Garg
760ba0877c Merge pull request #31411 from frappe/mergify/bp/version-13-hotfix/pr-31350
fix: Conversion rate validation for multi-currency invoices (backport #31350)
2022-06-21 10:28:15 +05:30
Deepesh Garg
da70b69d68 test: Add test case
(cherry picked from commit 8f37393044)
2022-06-21 03:40:13 +00:00
Deepesh Garg
4186aafd07 fix: Conversion rate validation for multi-currency invoices
(cherry picked from commit d05d15346a)
2022-06-21 03:40:13 +00:00
marination
70a7dfe2f0 chore: Missing import flt 2022-06-20 17:18:01 +05:30
Marica
e982abbe4d chore: Change autoname to v13 compatible value (#31407)
- 'autoincrement' is present only in v14
- 'hash' is automatically still used in tables but change value for safety
2022-06-20 17:09:52 +05:30
marination
5bcfbbe124 chore: fix merge conflict 2022-06-20 16:59:18 +05:30
Deepesh Garg
8e2e61ef84 chore: resolve conflicts 2022-06-18 20:23:58 +05:30
Deepesh Garg
b3169edfc8 Merge pull request #31275 from frappe/mergify/bp/version-13-hotfix/pr-31247
fix(india): e-invoice eligibility if company gstin is not configured (backport #31247)
2022-06-17 21:41:44 +05:30
Deepesh Garg
8d63abb442 chore: fix condition
(cherry picked from commit e457288dba)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
2022-06-17 15:39:53 +00:00
Deepesh Garg
3b9f943335 fix: Quotation lost update
(cherry picked from commit 02f9441e1a)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
2022-06-17 15:39:52 +00:00
Marica
642b9c5466 fix: Respect system precision for user facing balance qty values (#30837)
* fix: Respect system precision for user facing balance qty values

- `get_precision` -> `set_precision`
- Use system wide currency precision for `stock_value`
- Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users

* fix: Consider system precision when validating future negative qty

* test: Immediate Negative Qty precision test

- Test for Immediate Negative Qty precision
- Stock Entry Negative Qty message: Format available qty in system precision
- Pass `stock_uom` as confugrable option in `make_item`

* test: Future Negative Qty validation with precision

* fix: Use `get_field_precision` for currency precision as it used to

- `get_field_precision` defaults to number format for precision (maintain old behaviour)
- Don't pass `currency` to `get_field_precision` as its not used anymore

(cherry picked from commit d6078aa911)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
2022-06-17 09:46:09 +00:00
mergify[bot]
051e5cd741 fix: UOM handling for transaction without item (backport #31389) (#31391)
fix: UOM handling for transaction without item (#31389)

If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.

Simplest solution:

- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions

(cherry picked from commit 10583eb3ce)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 15:11:28 +05:30
mergify[bot]
4e2ed6f9d9 fix: transaction date gets unset in material request (#31387)
* fix: transaction date gets unset in material request (#31327)

* fix: set date correctly in material request

* fix: use only `transaction_date` in `get_item_details`

* fix: resolve merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-06-17 12:04:10 +05:30
Marica
2d6e518f87 Merge pull request #31380 from frappe/mergify/bp/version-13-hotfix/pr-31372
chore: Fix a potential variable misuse bug (backport #31372)
2022-06-16 12:47:58 +05:30
Marica
0f3a02db57 fix: Merge Conflicts 2022-06-16 12:23:13 +05:30
Jingxuan He
2cd03196a4 chore: Fix a potential variable misuse bug (#31372)
* Fix a potential variable misuse bug

* chore: Separate check (separate line) for empty table in Pricing Rule

* chore: Code readability & check for field in row (now row itself)

Co-authored-by: marination <maricadsouza221197@gmail.com>
(cherry picked from commit b4a93da9f3)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.py
2022-06-16 06:47:49 +00:00
Ankush Menat
f19ed0b74c perf: GLE reposting with progress and chunking (backport #31343) (#31373)
* fix: dont use cached doc for GLE reposts

ported from https://github.com/frappe/erpnext/pull/31240

* perf: GLE reposting with progress and chunking

If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.

- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
  processed so in future progress is resumed in event of timeout.

* test: add "actual" test for chunked GLE reposting
2022-06-15 20:54:20 +05:30
Marica
001130c0da Merge pull request #31368 from frappe/mergify/bp/version-13-hotfix/pr-31353
fix: Pick Template BOM if variant BOM absent in WO popup from SO (backport #31353)
2022-06-15 15:42:58 +05:30
marination
7c35887d07 fix: Pick Template BOM if variant BOM absent in WO popup from SO
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked

(cherry picked from commit 9f2d325e67)
2022-06-15 09:07:54 +00:00
mergify[bot]
ebcdaf7c82 fix: Spelling mistake in quotation depend on (backport #31362) (#31363)
* fix: Spelling mistake in quotation depend on (#31362)

Update quotation.json

(cherry picked from commit 37e9622426)

* chore: bump modified

Co-authored-by: Nihantra C. Patel <99652762+nihantra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:05:46 +05:30
Deepesh Garg
55e0c03ef0 Merge pull request #31347 from frappe/mergify/bp/version-13-hotfix/pr-31322
fix: Company address filter in quotation (backport #31322)
2022-06-14 12:44:59 +05:30
Deepesh Garg
da1a948a28 chore: resolve conflicts 2022-06-14 11:36:43 +05:30
Deepesh Garg
823cf88c3c chore: linting issues
(cherry picked from commit fb3da124e5)
2022-06-14 05:47:58 +00:00
Deepesh Garg
37ba550398 fix: Partially Ordered status for quotation
(cherry picked from commit 118c786e63)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.json
2022-06-14 05:47:57 +00:00
Deepesh Garg
a1ba8475d0 fix(India): Sales taxes and charges template fetching in quotation
(cherry picked from commit 243625898e)
2022-06-14 05:47:55 +00:00
Deepesh Garg
d375939475 fix: Company address filter in quotation
(cherry picked from commit 2fc04f661a)
2022-06-14 05:47:54 +00:00
Marica
c5bda9cb09 Merge pull request #31344 from frappe/mergify/bp/version-13-hotfix/pr-31341
fix: Supplied Qty not updated on Stock Entry cancel (backport #31341)
2022-06-13 23:24:49 +05:30
Marica
6064ca6fed test: Pass "yes" instead of 1 for is_subcontracted in create_purchase_order 2022-06-13 21:06:04 +05:30
marination
86a0ba5c9f test: PO Supplied Qty reset on cancel/submit
(cherry picked from commit b8f468cb4f)
2022-06-13 15:13:54 +00:00
marination
79b20622c9 fix: Supplied Qty not updated on Stock Entry cancel
- Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel
- Use DB API insteaf of raw SQL

(cherry picked from commit fa1d9d548e)
2022-06-13 15:13:53 +00:00
Saqib Ansari
fb1325d7a5 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31247 2022-06-13 17:08:23 +05:30
mergify[bot]
5d0f271451 fix: update fr translation (backport #31232) (#31334)
* fix: update fr translation (#31232)

* update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* Update fr.csv

update typo

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* fix: Use elision instead of HTML code equivalent

* fix: Use elision instead of HTML code equivalent (pt 2)

* fix: Use elision/single quote instead of HTML code equivalent (pt 3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 83367bfe5e)

* fix: Accidental '=' instead of comma

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-06-13 12:18:46 +05:30
Marica
1e6e652988 Merge pull request #31314 from frappe/mergify/bp/version-13-hotfix/pr-31303
fix: locale Currency and Float setting in update_employee (backport #31303)
2022-06-13 10:49:29 +05:30
Marica
ff770bbf04 Merge pull request #31321 from frappe/mergify/bp/version-13-hotfix/pr-31320
fix(UX): use doc.status for Job Card status (backport #31320)
2022-06-13 10:30:05 +05:30
Ankush Menat
78473b8d99 fix(UX): use doc.status for Job Card status (#31320)
- Use doc.status directly for indicator - single source of truth
- Update status to cancelled when doc is cancelled

(cherry picked from commit 39ec0aca95)
2022-06-13 10:04:53 +05:30
Deepesh Garg
977d6969d5 Merge pull request #31318 from frappe/mergify/bp/version-13-hotfix/pr-31295
fix: update Period Closing Voucher per Company (backport #31295)
2022-06-11 23:44:22 +05:30
mergify[bot]
50a4c2e9dc refactor: remove add_fetch (backport #31315) (#31319)
* refactor: remove add_fetch (#31315)

- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction

Reason for removal: the JS code applies arbitrarily to any field called "sales_person"

(cherry picked from commit 1646fbe478)

# Conflicts:
#	erpnext/selling/sales_common.js

* chore: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-10 18:30:50 +05:30
hendrik
5ebbe81543 fix: update Period Closing Voucher per Company
Validate period closing voucher company-wise

(cherry picked from commit 74b274f555)
2022-06-10 09:23:36 +00:00
Deepesh Garg
395f86f42b Merge pull request #31310 from frappe/mergify/bp/version-13-hotfix/pr-31294
fix(India): Incorrect taxable in GSTR-3B report (backport #31294)
2022-06-10 14:27:20 +05:30
Deepesh Garg
9e0cb2a467 Merge pull request #31262 from frappe/mergify/bp/version-13-hotfix/pr-30155
fix: Add cost center in loan document (backport #30155)
2022-06-10 13:16:33 +05:30
Deepesh Garg
1aaca097b3 chore: Linting Issues 2022-06-10 12:51:16 +05:30
Deepesh Garg
309bdf257d Merge pull request #31139 from frappe/mergify/bp/version-13-hotfix/pr-31102
feat: Add german translations (backport #31102)
2022-06-10 12:42:10 +05:30
Deepesh Garg
4c9422fb1b chore: resolve conflicts 2022-06-10 12:39:12 +05:30
RJPvT
391ed9c567 fix: locale Currency and Float setting in update_employee
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled

(cherry picked from commit 17887cde71)
2022-06-10 06:05:51 +00:00
Deepesh Garg
95f8784ea9 chore: Resolve conflicts 2022-06-10 10:59:46 +05:30