Deepesh Garg
f57f4af1d9
fix: Write off amount wrongly calculated in POS Invoice
...
(cherry picked from commit ee4258e42c33899fae7b7add8a676274259a40e0)
2022-03-25 15:27:10 +00:00
Ankush Menat
0534cf6c9c
fix: show subassembly table always ( #30422 )
...
[skip ci]
2022-03-25 19:03:33 +05:30
Saqib Ansari
80c7d7064b
Merge branch 'develop' into fix-minor-custom-cash-flow
2022-03-25 17:16:42 +05:30
Saqib Ansari
5450542fdb
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-03-25 16:44:37 +05:30
Wolfram Schmidt
85b0d5fc77
fix: translations ( #30387 )
...
fixed and added translation
2022-03-25 16:22:23 +05:30
Ankush Menat
f06ef17b5d
fix: copy has_batch_no and has_serial_no while duplicating
2022-03-25 16:18:58 +05:30
Ankush Menat
f4b39b87e3
fix(UX): use autocomplete for variant fields
2022-03-25 16:18:58 +05:30
Saqib Ansari
936267c934
fix: move item tax to item tax template patch
2022-03-25 15:45:13 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
...
fix: multiple pos issues
2022-03-25 15:34:54 +05:30
Deepesh Garg
a9d992ac9f
Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes
...
fix: Currency symbol in bank transactions
2022-03-25 14:39:01 +05:30
Saqib Ansari
e0c36d87e0
chore: ignore rules for QB formatting
2022-03-25 14:26:12 +05:30
Deepesh Garg
3a639f6329
Merge pull request #30413 from frappe/mergify/bp/develop/pr-30406
...
fix: Rate change issue on save and mapping from other doc (backport #30406 )
2022-03-25 14:17:48 +05:30
Deepesh Garg
97e102ceef
fix: Condition
...
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
2022-03-25 07:30:41 +00:00
Deepesh Garg
a83a0a03b1
fix: Revert rate calculation
...
(cherry picked from commit 6937a498e71cffc56cad65141f561b4c8785d185)
2022-03-25 07:30:40 +00:00
Deepesh Garg
54cdff7947
fix: Add back calculation for discount
...
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398
fix: Rate change issue on save and mapping from other doc
...
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
2022-03-25 07:30:40 +00:00
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches ( #30409 )
...
* fix: failing broken patches
* refactor: simpler conditions
[skip ci]
2022-03-25 12:49:37 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again
2022-03-25 10:52:08 +05:30
Saqib Ansari
16253a2f72
fix: set is_return & return_against in POS Invoice Reference table
2022-03-25 10:51:30 +05:30
Ankush Menat
788d492757
test: basic item and wh capacity dashboard tests
2022-03-25 10:51:19 +05:30
Ankush Menat
10d5fb8cd1
test: check printviews for all docs
2022-03-25 10:51:19 +05:30
Saqib Ansari
1b556d1c53
fix: test cases
2022-03-24 17:59:34 +05:30
Ankush Menat
d4ee31dc8f
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 17:58:22 +05:30
Saqib Ansari
cb4873c019
fix: sider issues
2022-03-24 17:56:27 +05:30
Marica
6ebb19d063
Merge pull request #30399 from ankush/wo_dead_links
...
fix: broken production item links on production plan
2022-03-24 16:49:38 +05:30
Saqib Ansari
cf51a0a1b8
fix(pos): cannot close the pos if sr. no. is sold & returned
2022-03-24 16:22:36 +05:30
Ankush Menat
5b1d6055e6
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>
2022-03-24 15:00:05 +05:30
Ankush Menat
3d43c437ad
fix: only validate qty for main non-subassy items
2022-03-24 15:00:05 +05:30
Marica
d24458ab77
fix: (ux) Add is_group=0 filter on website warehouse ( #30396 )
...
- It does not support group warehouses right now and it is misleading
2022-03-24 12:56:57 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again
2022-03-24 11:18:13 +05:30
Deepesh Garg
4147f2134f
Merge pull request #30334 from deepeshgarg007/gst_state_number_unsetting
...
fix: Reset GST State number
2022-03-23 23:30:20 +05:30
Deepesh Garg
07c7ebfd99
Merge branch 'develop' into gst_state_number_unsetting
2022-03-23 22:04:13 +05:30
Ankush Menat
c9dcf31cf7
test: ensure super()setUpClass is called
2022-03-23 19:46:50 +05:30
Deepesh Garg
9c607dd6c5
Merge pull request #30323 from deepeshgarg007/sales_person_dashboard
...
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-23 16:57:18 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard
2022-03-23 16:11:22 +05:30
Ankush Menat
6418dc1606
fix: make auto created job cards "Open"
2022-03-23 15:50:46 +05:30
Ankush Menat
e1f5620654
fix: material transfer status should be before WIP
2022-03-23 15:50:46 +05:30
Ankush Menat
4aa74af90d
fix: ignore items without info for pending qty computation
2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb
chore(DX): add sourceURL for debugging
2022-03-23 15:46:40 +05:30
Deepesh Garg
d180d09916
Merge pull request #30372 from deepeshgarg007/price_list_ignore_fix
...
fix: Check if onload property exists in the form object
2022-03-23 13:56:01 +05:30
Deepesh Garg
78ca88d227
fix: Check if onload property exists in the form object
2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display
...
fix: GST account not showing up in tax templates
2022-03-23 13:17:11 +05:30
Deepesh Garg
83fc05ef7d
Merge pull request #30365 from deepeshgarg007/ignore_price_list
...
fix: Changing item prices on converting orders/receipts to invoices
2022-03-23 10:09:33 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c
fix: Add ignore pricelist for missing flows
2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da
fix: GST account not showing up in tax templates
2022-03-22 18:26:58 +05:30
Saqib Ansari
f2ae63cbfd
fix(pos): remove returned sr. nos. from pos reserved sr. nos. list
2022-03-22 17:41:49 +05:30
Ankush Menat
f606d2ecc6
fix: flaky salary slip email test ( #30358 )
2022-03-22 17:36:18 +05:30
Ankush Menat
41db43cdc5
fix: consider full integer batch nos
2022-03-22 16:40:17 +05:30
