Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,001 Commits 3 Branches 0 Tags 1 GiB
b455318f01
Commit Graph

29001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh
039679cad1
Merge branch 'develop' into shopify 2019-09-30 19:08:44 +05:30
Chinmay Pai
5dfc74c851 fix(amazon-mws): python3 compatibility changes (#19210) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 16:59:58 +05:30
Chinmay Pai
9d26c69c4a fix(amazon-mws): python3 compatibility changes (#19209) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-30 16:59:42 +05:30
DeeMysterio
20194c4cc5 rename return/invoice to Purchase return/invoice (#19212) 2019-09-30 16:59:15 +05:30
Rohan
d463c346fe fix: set no-copy on some contract fields (#19208) 2019-09-30 16:37:29 +05:30
Nabin Hait
25e043766a
fix: Get leave approvers in Employee leave balance report (#19211) 2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
905573700b feat(report): fixed asset register (#19164) 
* feat(report): fixed asset register

* fix: fetch supplier and check for asset status

* fix: fetch vendor name from purchase invoice

* style(fixed-asset-register): use conventional column name

* Update fixed_asset_register.py
 2019-09-30 16:10:46 +05:30
Himanshu
37f4316df0
Update setup_wizard.py 2019-09-30 16:02:24 +05:30
Marica
de15cc1387 fix: Work order dialog box 'Select Quantity' on clicking 'Finish' (#19136) 
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
 2019-09-30 15:36:33 +05:30
rohitwaghchaure
8d889ef80e fix: update the pending qty in production plan on completion of work order (#19180) 2019-09-30 15:22:12 +05:30
Deepesh Garg
b54f0fb388 fix: Party column empty in accounts receivable/ payable summary (#19205) 2019-09-30 15:19:56 +05:30
Suraj Shetty
1da81d8755
Merge pull request #19206 from hrwX/disp_mobile_no 
fix: Show primary mobile no
 2019-09-30 15:18:01 +05:30
Suraj Shetty
b093ea1f0a
feat: Remove Leaderboard from ERPNext (#19156) 
feat: remove Leaderboard from ERPNext
 2019-09-30 15:17:26 +05:30
rohitwaghchaure
ed1cc18ab5 fix: stock ledger report not showing data if the UOM filter has selected (#19179) 2019-09-30 15:15:52 +05:30
Marica
147af15268 fix: Added 'Manual' % Complete Method in Project (#19175) 
Added additional '% Complete Method' in Project so that Project can be set to 'Completed' irrespective of presence of Tasks
 2019-09-30 15:11:15 +05:30
prssanna
1f512b36c5 fix(patch): set app_type as private 2019-09-30 14:57:21 +05:30
hrwx
ebc0e1ca8a fix: remove return statement 2019-09-30 14:56:39 +05:30
hrwx
bf09fbe6b9 fix: sku 2019-09-30 14:56:39 +05:30
hrwx
5c036d9aaf fix: permissions 2019-09-30 14:56:39 +05:30
hrwx
5aa8743024 changes 2019-09-30 14:56:39 +05:30
prssanna
c6b7695ab5 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
c8ad8bb7aa fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
09f4e0b19c fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
a9aac02b90 fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
e64bdcd12b fix: default private app type 2019-09-30 14:56:39 +05:30
prssanna
f380b215b2 fix: shopify integration 2019-09-30 14:56:39 +05:30
Himanshu
201bcaf2ca fix(Company): Do not set default account if left blank (#19131) 
* chore: use dict to set_default_account

* fix: dont override expense account if left empty

* fix: set accounts only if new company

* chore: fix alignment

* fix: test cases
 2019-09-30 14:56:08 +05:30
Himanshu
7d6f52f4ab fix: add system user perm in patient (#19133) 2019-09-30 14:40:56 +05:30
Mangesh-Khairnar
d8763d7d65 fix: allow rename/merge in opportunity (#19202) 2019-09-30 14:39:46 +05:30
Himanshu Warekar
46831c4c20 fix: show mobile no 2019-09-30 14:34:56 +05:30
Himanshu
32b587b3a0
Merge branch 'develop' into global_search_modules 2019-09-30 13:44:42 +05:30
Himanshu Warekar
21abc3aa50 fix: add doctypes for modules 2019-09-30 13:40:02 +05:30
Suraj Shetty
4c3f0b94a4
Merge branch 'develop' into leaderboard 2019-09-30 13:11:19 +05:30
Suraj Shetty
fcb6edf571 Merge branch 'leaderboard' of github.com:prssanna/erpnext into leaderboard 2019-09-30 13:09:53 +05:30
Suraj Shetty
d23c9987ed style: Fix Codacy 2019-09-30 13:09:12 +05:30
Rohan
c86cdd609e
Merge branch 'develop' into dev-serial-no-statuses 2019-09-30 13:08:10 +05:30
Deepesh Garg
91aa671a23
Merge pull request #19137 from marination/invoice-discounting 
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
 2019-09-30 12:43:09 +05:30
Suraj Shetty
6bd4509923
Merge branch 'develop' into leaderboard 2019-09-30 12:35:39 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037) 
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
 2019-09-30 12:15:39 +05:30
Suraj Shetty
38794c0ca1
Merge branch 'develop' into leaderboard 2019-09-30 11:54:28 +05:30
prssanna
b874922404 fix: whitelist leaderboard functions 2019-09-30 11:12:10 +05:30
Deepesh Garg
296bf9ef42 chore: Add standard chart of accounts template for El Salvador (#19151) 
* chore: Add standard chart of accounts template for El Salvador

* fix: Renane template file
 2019-09-30 11:02:49 +05:30
Deepesh Garg
7b1b3f0fa8 fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189) 2019-09-30 11:01:05 +05:30
Rucha Mahabal
3564ac7c88 fix: don't create debit/credit note automatically (#19185) 2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8 feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046) 2019-09-30 10:57:32 +05:30
Roland
6edce82aef do not require address in webshop (#19096) 
fix: #17559 - in webshop adding address should not be mandatory e.g. for online service goods, button to add address remains available
 2019-09-30 10:56:22 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68
Merge branch 'develop' into invoice-discounting 2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Mangesh-Khairnar
77f22635f2 fix(stock-ageing): filter none values from the fifo queue 2019-09-27 17:50:52 +05:30