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

2162 Commits

Author SHA1 Message Date
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
pipeCh
c16c7fffb4 fixed for "Select Serial Numbers" dialog won't fill mandatory field 2019-01-24 15:00:07 +07:00
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total 
fix: Disable rounded total field's value honours docfield's default value
 2019-01-22 09:58:06 +05:30
scmmishra
f2d0be7299 [feat] Modified help config 2019-01-21 19:35:46 +05:30
scmmishra
dd461636e3 [feat] Updated all help_links 2019-01-21 19:35:02 +05:30
Nabin Hait
a39f324682 fix: Disable rounded total field's value honours docfield's default value 2019-01-21 18:50:50 +05:30
Aditya Hase
442c85c006 fix(marketplace): Capitalize marketplace factory class to support router changes (#16428) 2019-01-18 21:28:37 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
 2019-01-10 04:23:40 +05:00
Saif Ur Rehman
2689dea72a fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse 2019-01-09 13:43:06 +05:00
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/item/item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 2019-01-08 13:41:46 +05:00
Saif Ur Rehman
13a6c0aeff Fix tests 2019-01-06 18:14:18 +05:00
Saif Ur Rehman
7ea6554f1f Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template 
# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/stock/doctype/item/item.json
 2019-01-06 04:43:13 +05:00
deepeshgarg007
8300f5ede7 fix: Codacy issues and added test case 2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix 2019-01-01 19:46:08 +05:30
Saif Ur Rehman
eeead1d777 fix: Only load transaction's company's tax accounts in item tax map 2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e feat: Tax Category based on Address 2018-12-29 01:49:11 +05:00
Saif Ur Rehman
e414a92d55 fix: Run get_item_tax_info and set_taxes serially 2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478 feat: add_taxes_from_item_tax_template 2018-12-28 04:53:25 +05:00
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a More work on Tax Category and Item Tax Template 2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
deepeshgarg007
64238ee91f (Codacy Fix) Fixed indenttion 2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12 Loyalty program issue fix in customer dashboard 2018-12-25 16:06:19 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
5555bf82f8 Capitalize marketplace factory class to support recent router changes (#16238) 2018-12-19 10:15:59 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Rohan
159897d88d fix(customer): Fix Total Unpaid amount in Customer dashboard (#16234) 2018-12-18 14:52:23 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Prateeksha Singh
c0f90beb7c Rename 'Chat' to 'Gitter Chat' 2018-12-12 21:29:55 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Stavros Anastasiadis
3d82b74ea4 Update Items in Submit state can add new row (#15644) 
* Update Items in Sumbit state can add new row

In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items

* Remove unused code line

* Remove blocking db save thread line

* Remove Company as not standard Field in Purchase Order Item

* Minor indentation fix

* Add Unit Test, add new row in update_child_qty_rate

* Codacy fix
 2018-12-10 17:30:55 +05:30
Sagar Vora
4c5bd253a2 fix(party dashboard): empty array is truthy, check for length (#16184) 2018-12-10 17:19:10 +05:30
Nabin Hait
3248e0bb3e
Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr 
fix(setup-wizard): Validate abbr length before switching to next slide
 2018-12-07 15:20:23 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f Merge branch 'master' into staging-fixes 2018-12-06 09:26:42 +00:00
Nabin Hait
32c95c3292
Merge pull request #16113 from nabinhait/travis-fix 
fix(test): Fixed tests for discount with margin and period closing voucher
 2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da fix(setup-wizard): Validate abbr length before switching to next slide 2018-12-06 07:37:32 +05:30
Rohit Waghchaure
675567419b [Fix] Permissions issue 2018-12-04 18:43:52 +05:30
deepeshgarg007
c981fb389b Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix 2018-11-29 14:57:50 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00