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

39236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
e783e3f93e fix: do not update status to Paid if sanctioned amount is 0 2022-03-25 23:43:46 +05:30
Rucha Mahabal
ed0a685e0e chore: sort imports 2022-03-25 23:43:46 +05:30
Rucha Mahabal
7d3c211b1f test: expense claim against fully and partially paid advances 2022-03-25 23:43:46 +05:30
Rucha Mahabal
961e691bdc fix: Expense Claim conditions for Paid status 
- status doesn't change to Paid if the entire required amount is already covered via linked advances

- status doesn't change to Paid if the claim is partially paid via advances

- patch to update such uncancelled claims to Paid
 2022-03-25 23:43:46 +05:30
Deepesh Garg
c2b2b3962a Merge pull request #30429 from deepeshgarg007/transaction_issue 
fix: Check for onload property
 2022-03-25 21:51:07 +05:30
Deepesh Garg
71402b43a7 fix: Check for onload property 2022-03-25 21:49:19 +05:30
Deepesh Garg
0740158431 Merge pull request #30395 from deepeshgarg007/pos_write_off 
fix: Write off amount wrongly calculated in POS Invoice
 2022-03-25 20:56:19 +05:30
mergify[bot]
8b5fe164fd fix: show subassembly table always (#30422) (#30423) 
[skip ci]

(cherry picked from commit 0534cf6c9c)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-25 19:04:22 +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
26b90ffce0 Merge pull request #30406 from deepeshgarg007/rate_change_fixes 
fix: Rate change issue on save and mapping from other doc
 2022-03-25 12:59:40 +05:30
mergify[bot]
29fde6ee8b fix: failing broken patches (#30409) (#30412) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]

(cherry picked from commit c4854bb1b1)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2022-03-25 12:57:05 +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
067564bd26 fix: Add back calculation for discount 2022-03-25 12:17:51 +05:30
Deepesh Garg
13fcda5776 fix: Rate change issue on save and mapping from other doc 2022-03-25 10:46:09 +05:30
Ankush Menat
20794ac9ce fix: consider all existing PO items 
When this is sent from API/client side doesn't send temporary_name it
can be flaky. Hence, use all available names for validation.
 2022-03-24 18:00:00 +05:30
mergify[bot]
03d7fc1570 fix: broken production item links on production plan (backport #30399) (#30400) 
* fix: only validate qty for main non-subassy items

(cherry picked from commit 3d43c437ad)

* fix: subassembly items linked to temporary name

Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 5b1d6055e6)

* test: dont resubmit WO

[skip ci]

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-24 17:30:58 +05:30
Deepesh Garg
d3fd2fd2c5 fix: Ignore for Purchase Invoices 2022-03-24 13:35:32 +05:30
Deepesh Garg
ed38679d22 fix: Ignore for Purchase Invoices 2022-03-24 13:09:55 +05:30
mergify[bot]
26fe2388e1 fix: (ux) Add is_group=0 filter on website warehouse (#30396) (#30397) 
- It does not support group warehouses right now and it is misleading

(cherry picked from commit d24458ab77)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-03-24 13:01:06 +05:30
Deepesh Garg
2e33e748ea fix: Client side changes for POS Write off amount 2022-03-24 12:56:22 +05:30
Deepesh Garg
ee4258e42c fix: Write off amount wrongly calculated in POS Invoice 2022-03-24 12:31:37 +05:30
Deepesh Garg
e63f20b3f7 Merge pull request #30389 from frappe/mergify/bp/version-13-hotfix/pr-30334 
fix: Reset GST State number (backport #30334)
 2022-03-24 10:11:13 +05:30
Deepesh Garg
cd20502c7e fix: Reset GST State number 
(cherry picked from commit 363e676a35)
 2022-03-23 18:00:47 +00:00
Deepesh Garg
aded1fca3e Merge pull request #30343 from deepeshgarg007/item_tax_template_bug 
fix: Taxes not getting fetched from item tax template
 2022-03-23 22:02:17 +05:30
Ankush Menat
54e4ff19ee fix: make auto created job cards "Open" 
(cherry picked from commit 6418dc1606)
 2022-03-23 16:46:22 +05:30
Ankush Menat
ff38d0498b fix: material transfer status should be before WIP 
(cherry picked from commit e1f5620654)
 2022-03-23 16:46:22 +05:30
Ankush Menat
a1740b0762 fix: ignore items without info for pending qty computation 
(cherry picked from commit 4aa74af90d)
 2022-03-23 15:51:29 +05:30
Ankush Menat
277c03e157 chore(DX): add sourceURL for debugging 
(cherry picked from commit be16fb9dbb)
 2022-03-23 15:51:29 +05:30
Deepesh Garg
67b9f43330 Merge pull request #30367 from frappe/mergify/bp/version-13-hotfix/pr-30365 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365)
 2022-03-23 14:27:22 +05:30
Deepesh Garg
a3f4069ad5 fix: Check if onload property exists in the form object 2022-03-23 13:58:21 +05:30
Deepesh Garg
ebcd85e675 Merge pull request #30371 from frappe/mergify/bp/version-13-hotfix/pr-30361 
fix: GST account not showing up in tax templates (backport #30361)
 2022-03-23 13:42:44 +05:30
Deepesh Garg
0979ba0670 fix: GST account not showing up in tax templates 
(cherry picked from commit 57924599da)
 2022-03-23 07:47:52 +00:00
Deepesh Garg
0e3d0b0b03 fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
 2022-03-23 04:40:23 +00:00
Deepesh Garg
9f2868e858 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
 2022-03-23 04:40:22 +00:00
Ankush Menat
1b469bc341 fix: consider full integer batch nos 
(cherry picked from commit 41db43cdc5)
 2022-03-22 23:37:31 +05:30
Ankush Menat
4e3bb12b3a fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.

(cherry picked from commit a18c687844)
 2022-03-22 23:37:31 +05:30
Marica
315599b46f Merge pull request #30355 from frappe/mergify/bp/version-13-hotfix/pr-30336 
fix: Product Filters Lookup (backport #30336)
 2022-03-22 18:05:17 +05:30
mergify[bot]
7e6131280f fix: flaky salary slip email test (backport #30358) (#30360) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 17:55:26 +05:30
marination
cfce719a7d fix: Add temporary text-md variable to maintain placeholder font size in input fields 
- font is unusally large for filter lookup input
 2022-03-22 16:12:30 +05:30
mergify[bot]
e29757f023 test: get leave allocation records query (backport #30342) (#30353) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-22 15:44:45 +05:30
Marica
0f774f2f07 fix: Merge conflicts in macros 
- Use `filter-lookup-wrapper` on checkbox wrapper
- Bind data value to wrapper
 2022-03-22 15:39:36 +05:30
marination
37134b04d8 fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field

(cherry picked from commit f6e64c2cac)

# Conflicts:
#	erpnext/templates/includes/macros.html
 2022-03-22 10:02:28 +00:00
Deepesh Garg
7cba4975ef fix: Taxes not getting fetched from item tax template 2022-03-21 21:28:41 +05:30
mergify[bot]
3ca90cc3c7 fix(ux): warning for disabled carry forwarding in Policy Assignment (backport #30331) (#30333) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-21 15:53:08 +05:30
mergify[bot]
34d27f1855 fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (backport #30307) (#30314) 
* fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307)

(cherry picked from commit ca8d757691)

# Conflicts:
#	erpnext/stock/doctype/item/test_item.py

* chore: conflicts

* refactor: correct usage for test decorator

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-21 15:39:04 +05:30
Nabin Hait
cedabd7242 fix: Future recurring period calculation for additional salary (#29581) 
* fix: Future recurring period calculation for addl salary

* fix: future recurring period calculation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-21 14:23:31 +05:30
Nabin Hait
c5f257da00 fix: While creating Payment Request from other forms, open a new Payment Request form without saving (#30228) 2022-03-21 14:22:10 +05:30
Nabin Hait
9abd22b408 fix: Payment Request Amount calculation in case of multicurrency (#30254) 2022-03-21 14:20:15 +05:30