rohitwaghchaure
8c69991c12
Merge pull request #22097 from marination/valuation-rate-hotfix
...
fix: '>=' not supported between instances of 'str' and 'int'
2020-06-10 14:12:03 +05:30
rohitwaghchaure
6b07ae89c0
Merge pull request #22168 from pipech/v12-hotfix-loyalty_program
...
fix(loyalty): loyalty point entry use wrong tier
2020-06-10 12:53:12 +05:30
mergify[bot]
703cee6abf
fix: update program course ( #22166 ) ( #22173 )
...
(cherry picked from commit 934e30ecacanupamvns0099@gmail.com >
2020-06-10 12:51:29 +05:30
Poranut Chollavorn
5a5361815f
docs(loyalty): fix wrong comment
2020-06-09 15:16:28 +00:00
Poranut Chollavorn
9831c5beca
fix(loyalty): loyalty point entry use wrong tier
2020-06-09 15:06:44 +00:00
rohitwaghchaure
139627b331
Merge pull request #22148 from marination/finished-good-valuation-hotfix
...
fix: Finished Product Valuation at Repack
2020-06-09 17:41:58 +05:30
Deepesh Garg
02e3fc141a
Merge pull request #22150 from deepeshgarg007/tdss_desscription_default
...
fix(accounting): Tax Withholding Category Description default
2020-06-08 14:05:54 +05:30
Deepesh Garg
65fb3f2c48
fix: Remove strip
2020-06-08 14:00:27 +05:30
Kevin Chan
5befddca39
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-06-08 14:00:17 +05:30
marination
189663f576
fix: Finished Product Valuation at Repack
2020-06-08 13:12:00 +05:30
rohitwaghchaure
b56156296b
Merge pull request #22093 from marination/shippinng-address-hotfix
...
fix: Apply shipping rule without address too
2020-06-08 10:36:30 +05:30
mergify[bot]
6732c9ab14
fix: fetch tax lines within the shipping lines ( #22138 ) ( #22139 )
...
(cherry picked from commit 3031128167mkhairnar10@gmail.com >
2020-06-07 18:59:06 +05:30
Deepesh Garg
38546cae33
Merge pull request #22068 from marination/item-attribute-hotfix
...
fix: Misleading Error message for Item Attribute.
2020-06-05 11:21:33 +05:30
P-Froggy
efdb55a083
fix: Wrong Ordered-Status Indicator for Material Request Items ( #22117 )
...
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.
2020-06-05 10:56:30 +05:30
Marica
a569fa36bd
Merge branch 'version-12-hotfix' into valuation-rate-hotfix
2020-06-04 15:31:35 +05:30
rohitwaghchaure
237ee1a9c6
Merge pull request #22110 from rohitwaghchaure/routing-operations-not-in-a-sequence-hotfix
...
fix: routing operations not added sequentially in the BOM
2020-06-04 14:52:08 +05:30
Rohit Waghchaure
1ae2376a83
fix: routing operations not added sequentially in the BOM
2020-06-04 14:50:22 +05:30
rohitwaghchaure
d0d35f03d0
Merge pull request #22108 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked-v12
...
fix: import supplier invoice not working
2020-06-04 14:35:10 +05:30
Rohit Waghchaure
58a43be4f5
fix: import supplier invoice not working
2020-06-04 14:32:57 +05:30
Deepesh Garg
869d0c37b8
Merge pull request #22099 from frappe/mergify/bp/version-12-hotfix/pr-22098
...
fix: Error when no data is present in AR/AP report (bp #22098 )
2020-06-03 22:40:30 +05:30
Deepesh Garg
c84961be85
fix: Error when no data is present in AR/AP reeport
...
(cherry picked from commit 7135a75e5e
2020-06-03 16:49:52 +00:00
marination
89dd0bad28
fix: '>=' not supported between instances of 'str' and 'int'
2020-06-03 17:22:56 +05:30
sahil28297
12ad34b44a
Merge pull request #22091 from nextchamp-saqib/asset-error-fix
...
fix: cannot create existing assets
2020-06-03 14:50:16 +05:30
marination
1a1ce9a743
fix: Apply shipping rule without address too
2020-06-03 14:42:46 +05:30
Saqib Ansari
4e3caa8ece
fix: cannot create existing assets
2020-06-03 14:15:16 +05:30
Deepesh Garg
28c9f3103f
Merge pull request #22087 from MyuddinKhatri/purchase-receipt-hotfix
...
fix(stock): create purchase invoice from purchase receipt dashboard
2020-06-03 13:37:36 +05:30
Myuddin khatri
99f5ece31c
fix(stock): able to create purchase invoice from purchase receipt dashboard
...
able to create purchase invoice from purchase receipt dashboard
2020-06-03 11:27:18 +05:30
gavin
5448be6f34
Merge pull request #22079 from frappe/mergify/bp/version-12-hotfix/pr-21491
...
feat(Tally migration): Errored documents handling (bp #21491 )
2020-06-03 01:41:07 +05:30
mergify[bot]
38ed43ca59
Merge branch 'version-12-hotfix' into mergify/bp/version-12-hotfix/pr-21491
2020-06-02 09:26:34 +00:00
Gavin D'souza
2e825a108f
chore: verbose error message for coa recursion
...
(cherry picked from commit cb1376b036
2020-06-02 08:24:58 +00:00
Gavin D'souza
43a19da27a
fix: un-using buggy JS frappe.new_doc
...
(cherry picked from commit 0c353a64a4
2020-06-02 08:24:58 +00:00
Gavin D'souza
8ea9b0a415
feat: maintain tally voucher numbers
...
feat: create seperate customer and supplier entries for same party if
case exists
(cherry picked from commit af612ddb6d
2020-06-02 08:24:58 +00:00
Gavin D'souza
d50cceaafa
feat: prompt that company and COA will be overwritten
...
(cherry picked from commit 51305a028b
2020-06-02 08:24:58 +00:00
Gavin D'souza
0a7afd77e2
fix: toggle read only for accounts post daybook data processing
...
style: code comments and updates
(cherry picked from commit f4926a8205
2020-06-02 08:24:58 +00:00
Gavin D'souza
adb864828a
perf: reduce JS memory heap and maintain namespaces
...
(cherry picked from commit 6b850b7e71
2020-06-02 08:24:57 +00:00
Gavin D'souza
18d432a843
fix: table cleanups, updated summary block
...
(cherry picked from commit 0d61b35b0b
2020-06-02 08:24:57 +00:00
Gavin D'souza
d3d511d31a
fix: run summary logger
...
style: indent fixes
(cherry picked from commit 27b7172fa4
2020-06-02 08:24:57 +00:00
Gavin D'souza
6950c10c6f
feat: handle resolve and unresolved errors
...
restructured and reused components
(cherry picked from commit 2e1b531f4f
2020-06-02 08:24:57 +00:00
Gavin D'souza
28a6e1deec
feat: maintain logs of errors successfully fixed
...
(cherry picked from commit 640636bbcd
2020-06-02 08:24:57 +00:00
Gavin D'souza
2f5208b08d
feat: order failed import log by creation, handle rollbacks and commits
...
(cherry picked from commit 1b5eea691c
2020-06-02 08:24:56 +00:00
Gavin D'souza
7ee6e83605
perf: reduce failed_error_log size
...
(cherry picked from commit 0805307514
2020-06-02 08:24:56 +00:00
Gavin D'souza
0a2bbfaf24
feat: error log handling
...
fix: toggle required accounts
(cherry picked from commit 82e7a9de28
2020-06-02 08:24:56 +00:00
Gavin D'souza
2ab6c8fa60
fix: set default round off acount
...
(cherry picked from commit 38c677689d
2020-06-02 08:24:56 +00:00
Gavin D'souza
61381963b7
feat: Error logging via doc
...
fix: Handle duplicate company and COA
feat: Error logging via doc
feat: fetch defaults for accounts
(cherry picked from commit 2de4a5a7c8
2020-06-02 08:24:56 +00:00
Gavin D'souza
5c448de2ae
feat: Add Failed error logs
...
fix: set defaults
(cherry picked from commit defeb73747
2020-06-02 08:24:55 +00:00
marination
f42d656cd3
fix: Misleading Error message for Item Attribute.
2020-06-01 12:03:20 +05:30
Deepesh Garg
0cd8102e0e
Merge pull request #22059 from frappe/mergify/bp/version-12-hotfix/pr-22057
...
fix(ewb): remove checksum validation for TRANSIN (bp #22057 )
2020-05-30 20:22:51 +05:30
karthikeyan5
ffbc812271
fix(ewb): remove checksum validation for TRANSIN
...
(cherry picked from commit ca46bedfcb
2020-05-30 14:25:39 +00:00
Deepesh Garg
056854fd9e
Merge pull request #22056 from marination/qty-validation-in-stock-entry-hotfix
...
fix: '<' not supported between instances of 'str' and 'int'
2020-05-30 19:49:57 +05:30
Rohit Waghchaure
e7e3af1684
fix: '<' not supported between instances of 'str' and 'int'
2020-05-30 18:38:41 +05:30
