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

2649 Commits

Author SHA1 Message Date
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
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
Sagar Vora
ceacacc320 Merge branch 'master' into staging-fixes 2019-01-22 15:37:05 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest 2019-01-20 16:53:41 +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
Rohit Waghchaure
fa7ee0b3b6 Added dafult bank account in the customer/supplier 2019-01-17 15:45:27 +05:30
Deepesh Garg
bce62a4bcc
Delete __init__.py 2019-01-16 22:57:45 +05:30
Deepesh Garg
70657d06f4
Delete pending_sales_order.json 2019-01-16 22:57:20 +05:30
Deepesh Garg
b8e0bfc335
Delete pending_quotation.json 2019-01-16 22:56:30 +05:30
Deepesh Garg
9cf9cb0e00
Delete __init__.py 2019-01-16 22:55:48 +05:30
Deepesh Garg
9da018d59c
Delete quotation.json 2019-01-16 22:55:10 +05:30
Deepesh Garg
23b7f0def4
Delete __init__.py 2019-01-16 22:54:17 +05:30
Deepesh Garg
e95a4053cf
Delete sales_order.json 2019-01-16 22:53:53 +05:30
Deepesh Garg
e4303111b4
Delete __init__.py 2019-01-16 22:53:00 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address 2019-01-16 17:51:49 +05:30
Nabin Hait
3dde949419 feat(mr_against_so): Merge same items from different BOMs 2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50 BIS issue fixes 2019-01-16 15:59:39 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address 2019-01-16 11:17:55 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency 
fix: Quotation to Sales Order with different currency
 2019-01-16 10:13:44 +05:30
Saurabh
7d630b3e29 Merge branch 'master' into staging-fixes 2019-01-15 19:41:09 +05:30
NahuelOperto
9080221d46 fix: added test cases 2019-01-14 12:12:56 -03:00
Saif Ur Rehman
502f15ba1b test: test_party_details_tax_category 2019-01-12 19:07:39 +05:00
NahuelOperto
7facc34851 fix: removed filter from method validate 2019-01-11 10:46:38 -03:00
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix 
fix: Sales Analytics Period Range
 2019-01-10 10:35:31 +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
deepeshgarg007
8621869d24 Created multiple reports and linked them to email digest 2019-01-09 21:56:45 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address 2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307 Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt 2019-01-09 17:09:11 +05:30
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
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
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
49ca9dceb2
Merge branch 'staging-fixes' into report-fix 2019-01-08 11:53:06 +05:30
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
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
Mangesh-Khairnar
e2ea987610 fixed edge cases for yearly, weekly and monthly views 2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a (refactor) removed unnecessary code 2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6 (fix) multiple years in yearly view 2019-01-05 00:15:31 +05:30
deepeshgarg007
32f054b901 Added customer group column in item-wise-sales-history report 2019-01-03 22:57:18 +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
deepeshgarg007
318dc422bc Updated test Cases for update_child_rate_qty 2019-01-01 18:30:33 +05:30
deepeshgarg007
de1e6fc1c4 Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason 2019-01-01 08:57:18 +05:30
Nabin Hait
cacbdec565
Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer 
[Fix] Not able to delete customer if contact is available
 2018-12-31 11:55:24 +05:30
deepeshgarg007
d9a768a88f feat: Set lost reasons in opportunity and quotation using table multiselect 2018-12-29 19:33:44 +05:30
Saif Ur Rehman
fd531a6b5e feat: Tax Category based on Address 2018-12-29 01:49:11 +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