CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,975 Commits 397 Branches 1,698 Tags
v10.x.x
Commit Graph

21975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gavin
49b0afccbd Merge pull request #21213 from gavindsouza/freeze-v10 
chore(v10): pin python dependencies
 2020-06-15 10:27:53 +05:30
Gavin D'souza
1183d3e1bc chore(travis): update and install setuptools and pip 2020-04-09 20:22:20 +05:30
Gavin D'souza
f876f4c2b2 chore: allow sudo in travis runs 2020-04-09 17:50:33 +05:30
Gavin D'souza
ac4a3057cf fix: travis add pip3 addon 2020-04-09 17:40:25 +05:30
Gavin D'souza
999216e727 fix: update easy install script usage 2020-04-09 15:17:41 +05:30
Gavin D'souza
a5fa29f256 chore: pin python dependencies 2020-04-09 10:44:34 +05:30
Deepesh Garg
1fddde0c0e fix: Account type in Handling Difference in Inventory account (#19678) 
* fix: Account type in Handling Difference in Inventory account

* fix: Add Stock Adjustment account

* fix: Rename account to stock adjustment
 2019-11-28 18:29:46 +05:30
Mangesh-Khairnar
e269aa9781 fix(bin): update requested qty in bin (#18314) 2019-07-15 14:07:50 +05:30
Aditya Hase
30be1181ea fix(error-report): Do not send error reports to support@erpnext.com (#17864) 2019-06-06 11:16:01 +05:30
Shivam Mishra
5a1b778cd2 Merge pull request #17793 from adityahase/remove-manifest-v10 
perf: Remove MANIFEST.in
 2019-05-29 15:31:19 +05:30
Aditya Hase
6dcc3a7596 perf: Remove MANIFEST.in 
Faster pip install -e erpnext

https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it

https://github.com/frappe/frappe/pull/7360
 2019-05-29 15:15:51 +05:30
Shivam Mishra
3657b2b0a4 fix: Task status fix (#17498) 2019-05-06 14:52:30 +05:30
Nabin Hait
cd701e3e6f Merge pull request #17149 from hrwX/gst_patch 
fix(India): run patch for GST custom fields
 2019-05-03 09:26:04 +05:30
Nabin Hait
55e54ef6a1 skip the patch for outside India 2019-05-02 21:56:44 +05:30
Nabin Hait
fb12805435 Merge pull request #17345 from deepeshgarg007/delivery_note_v10 
fix: Make button not appearing in delivery note
 2019-04-23 18:41:33 +05:30
deepeshgarg007
d21f1c0ce2 fix: Make button not appearing in delivery note 2019-04-23 17:56:05 +05:30
Saurabh
60b6f79349 Merge pull request #17303 from sahil28297/new_v10_site_sync 
fix(site_sync): return more data in level
 2019-04-22 12:01:35 +05:30
Sahil Khan
9366449cb4 fix: import iteritems 2019-04-22 11:07:18 +05:30
Sahil Khan
d12ede8510 fix: syntax error 2019-04-22 10:11:35 +05:30
Deepesh Garg
63f1eded95 fix: Datatype fix for balance in account currency (#17314) 2019-04-20 20:41:17 +05:30
Sahil Khan
a34f459065 fix: refactor level 2019-04-20 14:29:11 +05:30
Sahil Khan
ff1bd34e4c fix(site_sync): return more data in level 2019-04-19 16:36:40 +05:30
sahil28297
6e63de447a Merge pull request #17247 from frappe/revert-17227-v10_site_sync 
Revert "feat(site_sync): return erpnext data"
 2019-04-16 13:23:48 +05:30
sahil28297
d7ae52cd49 Revert "feat(site_sync): return erpnext data" 2019-04-16 13:23:16 +05:30
Nabin Hait
57646ec7de Merge pull request #17240 from hrwX/delivery_note_fix 
fix(Delivery Note): Show get items even if note has been amended
 2019-04-16 13:21:30 +05:30
Himanshu
d492db4ccb fix: let user delete the elements of items 2019-04-16 13:16:19 +05:30
Nabin Hait
16651241e8 Merge pull request #17227 from sahil28297/v10_site_sync 
feat(site_sync): return erpnext data
 2019-04-16 12:43:15 +05:30
Himanshu Warekar
e87e6d07ba fix: show get items even if note has been amended 2019-04-16 11:43:25 +05:30
Sahil Khan
a75973e9e5 feat(site_sync): return erpnext data 2019-04-14 18:45:31 +05:30
Himanshu Warekar
4802fc018b fix: run patch for gst 2019-04-05 17:01:19 +05:30
Nabin Hait
e012e2207a Merge pull request #17103 from hrwX/hsn_v10 
fix(India): HSN Code
 2019-04-05 15:52:01 +05:30
Himanshu Warekar
b7e0ae68ca fix: run gst patch 2019-04-04 11:17:15 +05:30
Himanshu Warekar
0e971f5088 Merge branch 'v10.x.x' of https://github.com/frappe/erpnext into hsn_v10 2019-04-04 11:16:44 +05:30
Nabin Hait
79936fa949 map supplier warehouse from PR to PI 2019-04-01 21:50:20 +05:30
Himanshu Warekar
203a712071 fix(India): HSN Code 2019-04-01 20:03:13 +05:30
Himanshu
c4bdefe666 fix(Leave Balance Report): return correct total number of leaves (#17009) 
* fix: return correct total nuber of leaves

* Use ORM for query
 2019-03-26 17:00:20 +05:30
Sagar Vora
898977bda8 Merge branch 'hotfix' v10.1.81 2019-01-29 17:10:19 +05:30
Sagar Vora
b32d9458b5 bumped to version 10.1.81 2019-01-29 17:30:19 +05:50
Nabin Hait
25cb13c0f8 Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes 
fix(human resources): gross pay calculation issue
 2019-01-29 12:08:11 +05:30
Nabin Hait
1c5d681f65 Merge pull request #16500 from scmmishra/v10-remove-docs 
feat: [v10] Deprecate In App Help
 2019-01-29 11:05:25 +05:30
Nabin Hait
8fae0b3017 Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied 
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
 2019-01-29 11:03:44 +05:30
Nabin Hait
57928a5382 Merge pull request #16468 from sagarvora/fix-scorecard 
fix(buying): make supplier scorecard usable
 2019-01-29 11:00:18 +05:30
Nabin Hait
b44b200e7c Merge branch 'hotfix' into fix-scorecard 2019-01-29 11:00:07 +05:30
Aditya Hase
9acb885e60 fix(sqli): Avoid SQL Injection with sender param (#16509) 2019-01-29 10:52:37 +05:30
Navdeep Ghai
ec570026e1 Merge branch 'hotfix' into salary-slip-net-pay-fixes 2019-01-29 09:12:37 +04:00
Nabin Hait
385e3bb284 Merge pull request #16446 from Zlash65/jv-fix 
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
 2019-01-29 10:41:15 +05:30
navdeepghai1
92bb84aa70 Changed static precision(2) value to system setting currency_precision value 2019-01-28 16:54:58 +04:00
Sagar Vora
a1a946fcd6 Merge branch 'hotfix' into fix-scorecard 2019-01-28 12:20:55 +05:30
navdeepghai1
aac404a155 Fixed net_pay calculation issue 2019-01-28 10:42:16 +04:00
scmmishra
1b63fa1920 [fix] Formatting issues 2019-01-25 20:45:04 +05:30