nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,430 Commits 463 Branches 1,750 Tags
4a6b5367ca5c86bfa3fefc80799321a0cb6c2ff6
Commit Graph

26430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
e6ec6cccfa Merge pull request #16316 from Anurag810/purchase-invoice-fixes 
fix: expense head of asset items in purchase invoice
 2019-01-08 20:23:14 +05:30
Nabin Hait
0f3ccba741 Update test_asset.py 2019-01-08 20:23:01 +05:30
Nabin Hait
2da5937864 Merge pull request #16314 from surajshetty3416/patch-to-rename-additional-salary-component 
fix: patch to rename additional salary component
 2019-01-08 20:21:16 +05:30
scmmishra
e2762df90b Fix: Naming series not reflecting in leave application 2019-01-08 17:38:28 +05:30
Saurabh
1836285c01 bumped to version 11.0.3-beta.34 v11.0.3-beta.34 2019-01-08 16:52:38 +06:00
rohitwaghchaure
ffdadbf97f fix: fallback to stock uom if uom is not defined (#16329) 
* [minor] Code cleanup

* fix: remove 'or' condition, won't execute
 2019-01-08 16:21:25 +05:30
Nabin Hait
c190192d5f Merge pull request #16277 from deepeshgarg007/loyalty-program-fix 
fix: Loyalty program issue fix in customer dashboard
 2019-01-08 12:15:57 +05:30
Nabin Hait
4c08aaef3d Merge pull request #16290 from deepeshgarg007/stock-recon 
fix: Unorderable type error while making stock reconciliation entry
 2019-01-08 11:55:49 +05:30
Nabin Hait
4216d86dd9 Merge pull request #16296 from deepeshgarg007/update_items_bug 
fix: Validation while updating items in sales order
 2019-01-08 11:54:52 +05:30
Nabin Hait
9ed6deb452 Merge pull request #16333 from deepeshgarg007/report-fix 
fix: added customer group column in Item-wise Sales History report
 2019-01-08 11:53:14 +05:30
Nabin Hait
49ca9dceb2 Merge branch 'staging-fixes' into report-fix 2019-01-08 11:53:06 +05:30
Nabin Hait
4e3e784691 Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix 
perf: Customer contact column in accounts receivable report
 2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc fix: Divide by zero exception fix in item wise purchase register (#16247) 
* Do not prepare row if stock quantity is not available

* Update item_wise_purchase_register.py
 2019-01-08 08:34:28 +05:30
Charles-Henri Decultot
c75300dc43 Purchase invoice modified date 2019-01-07 15:46:25 +00:00
Charles-Henri Decultot
8d36b362d1 Merge conflict resolution 2019-01-07 15:24:39 +00:00
Charles-Henri Decultot
4c57fae726 Codacy correction 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
2d1b5b0769 Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
1d7646f31f Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
1a19746904 Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e7fec6e659 Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c45e271b3e Add button to unlink bank account 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
422d483baf Move actions menu to standard menu 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c56f771c81 UX corrections + additional tests 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
89923b84b1 UX enhancements 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
c936f07a1e Correct Travis error 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
aea2fbf82d Correct test case for Travis 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
7a1ea42271 Addition of test cases 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
58438f4e5b Duplicate query to avoid SQL injection 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
f6d18e81e9 Modify SQL queries and add a test case 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e8f3050e27 Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
cbe63ec418 Codacy corrections 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
94899981d3 Dev cleanup 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
6a4dae3a9d Codacy corrections + sql queries 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
57c6b49d1a Dev cleanup 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
eae7424984 Cleanup dev 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
e394cec194 Bank reconciliation dashboard 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
818492387a WIP 2019-01-07 15:21:57 +00:00
Charles-Henri Decultot
31cb24f48d Bank reconciliation WIP 2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
590d8d3d3e Bank reconciliation wip 2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
6025e498f2 Bank reconciliation wip 2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
09cad814cd Reconciliation dashboard wip 2019-01-07 15:20:06 +00:00
Charles-Henri Decultot
c75a2b1eed Plaid integration 2019-01-07 15:20:06 +00:00
Saif
e5091cbc0f chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356) 
* chore: Updated DocType json files to clean up git diff of other PRs

* fix: remove auto-generated file
 2019-01-07 18:19:30 +05:30
Sagar Vora
7d60c03ed9 Merge branch 'staging-fixes' into pplan_fix 2019-01-07 15:54:16 +05:30
Sagar Vora
f5a00dc0c1 Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied 2019-01-07 15:45:33 +05:30
Sagar Vora
cad20abe83 Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-07 15:32:40 +05:30
Sagar Vora
a4af874a43 Merge branch 'staging-fixes' into update_items_bug 2019-01-07 15:21:02 +05:30
Sagar Vora
278d7a44f9 Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-07 15:12:44 +05:30
Sagar Vora
92cab55c72 Merge branch 'staging-fixes' into purchase-invoice-fixes 2019-01-07 15:03:37 +05:30
Sagar Vora
f14c56488f Merge pull request #16325 from rohitwaghchaure/not_able_to_access_report_quoted_item_comparison 
fix: report quoted item comparison not working
 2019-01-07 14:55:14 +05:30