nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,336 Commits 400 Branches 1,700 Tags
1222fb074fccd4676ac70cdb307b05cd48ea70bf
Commit Graph

30336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
1222fb074f fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:16:37 +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
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
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
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
rohitwaghchaure
f214789e4b fix: routing operations table is blank on pull of operations in BOM (#22040) 2020-05-29 21:27:31 +05:30
mergify[bot]
0407f018dd fix: cannot assign same task to other asset maintenance (#22024) (#22032) 
(cherry picked from commit cd8b5d1e4c)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-05-29 21:26:40 +05:30
mergify[bot]
592965a4d9 fix: disposed asset creates inconsistencies in asset depr report (#22021) (#22030) 
(cherry picked from commit 3c460364b5)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-05-29 21:26:29 +05:30
mergify[bot]
5b695d6e9f fix: transaction date not found in sales invoice (bp #22001) (#22029) 
* fix: transaction date not found in sales invoice

(cherry picked from commit 603cc3d05e)

* chore: tests

(cherry picked from commit dd39ba0014)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2020-05-29 21:26:16 +05:30
Deepesh Garg
245b8be435 Merge pull request #22033 from frappe/mergify/bp/version-12-hotfix/pr-21597 
fix: cannot make payment entry against shareholder (bp #21597)
 2020-05-29 13:21:59 +05:30
Saqib
840225d47b fix: cannot make payment entry against shareholder (#21597) 
(cherry picked from commit d46696fa03)
 2020-05-29 05:57:59 +00:00
Mangesh-Khairnar
0fcb79f361 fix: make transaction date of the oldest transaction as the last integration date (#22017) 
* fix: make transaction date of the oldest transaction as the last integration date

* fix: only save end date when transactions are returned
 2020-05-29 10:17:18 +05:30
Rucha Mahabal
74ddc04031 Merge pull request #22002 from frappe/mergify/bp/version-12-hotfix/pr-21999 
fix: change modified time (bp #21999)
 2020-05-28 13:03:18 +05:30
Michelle Alva
d65000a361 fix: change modified time 
changed modified time to sync the changes

(cherry picked from commit 8653419c4c)
 2020-05-28 07:31:23 +00:00
Deepesh Garg
6f37035617 Merge pull request #21920 from marination/import-italian-invoice 
chore: Added Italian Import Supplier Invoice to Menu
 2020-05-28 12:33:12 +05:30
Marica
aa6280f5cd Merge branch 'version-12-hotfix' into import-italian-invoice 2020-05-28 12:20:35 +05:30
mergify[bot]
64078da47b fix: change description for field (#21995) (#21996) 
grammatical fixes for description of Default Customer

(cherry picked from commit f7beeff2d8)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-05-28 11:10:32 +05:30
Deepesh Garg
d9013dc7c9 Merge pull request #21987 from deepeshgarg007/tds_computation_summary_v12 
fix: TDS computation summary report
 2020-05-27 22:56:36 +05:30
Deepesh Garg
a23f929005 fix: TDS computation summary report 2020-05-27 22:51:36 +05:30
Marica
4f75a3a29b Merge branch 'version-12-hotfix' into import-italian-invoice 2020-05-27 21:53:18 +05:30
marination
d9e6900e07 fix: Added permission via regional setup and patch 2020-05-27 21:53:01 +05:30
Deepesh Garg
b4a3e5f70b fix: Total for ageing column 121-Above (#21973) 2020-05-27 20:30:41 +05:30