nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,367 Commits 402 Branches 1,700 Tags
9ee4841520bfdf36f5400cfabdfe2460a316cdb9
Commit Graph

30367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
9ee4841520 fix: cannot update delivery date 2020-06-12 16:25:38 +05:30
Saqib Ansari
39e125b8a2 fix: label 2020-06-12 16:25:28 +05:30
Saqib Ansari
37b614af0e fix: submitted sales order can be updated with no permission 2020-06-12 16:25:07 +05:30
Deepesh Garg
18ccd6b253 Merge pull request #22204 from marination/account-tree-hotfix 
fix: Check for Company before rendering tree in Account Tree
 2020-06-12 10:03:21 +05:30
marination
5ee33bdbe9 fix: Check for Company before rendering tree in Account Tree 2020-06-11 20:31:08 +05:30
Deepesh Garg
95695f0628 Merge pull request #22189 from frappe/mergify/bp/version-12-hotfix/pr-22188 
fix: Update payment schedule based on payment terms (bp #22188)
 2020-06-10 22:31:28 +05:30
Deepesh Garg
755b8490e7 fix: Update payment schedule based on payment terms 
(cherry picked from commit a0fd97f2ac)
 2020-06-10 16:52:58 +00:00
Rohan
8a2c719359 fix: only auto-set serial nos and batches if allowed in Stock Settings (v12) (#21779) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* Remove auto_set_batch_no

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:11:20 +05:30
rohitwaghchaure
eaa6218003 Merge pull request #22183 from marination/website-price-list-hotfix 
fix: Prioritize Default Customer Price List in Portal
 2020-06-10 19:07:00 +05:30
marination
8710866886 fix: Prioritize Default Customer Price List in Portal 2020-06-10 18:28:14 +05:30
rohitwaghchaure
f09db536af Merge pull request #22178 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI 
fix: Cannot read property 'has_batch_no' of undefined
 2020-06-10 17:07:05 +05:30
Rohit Waghchaure
c848b97757 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:04:40 +05:30
rohitwaghchaure
8fcd86cb9e Merge pull request #22062 from marination/procurement-tracker 
fix: Procurement Tracker Data Consistency
 2020-06-10 14:13:19 +05:30
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 934e30ecac)

Co-authored-by: Anupam Kumar <anupamvns0099@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 3031128167)

Co-authored-by: Mangesh-Khairnar <mkhairnar10@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