Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,699 Commits 3 Branches 0 Tags 1 GiB
5816fc2801
Commit Graph

1521 Commits

Author SHA1 Message Date
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428 renamed purpose in stock entry 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48 feat: provision to make Maintenance Schedule from sales invoice 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
4ae221946b renamed report 2019-03-26 11:14:06 +05:30
Rohit Waghchaure
1c1d0bb1c7 feat: commonified item group wise target variance report 2019-03-25 17:56:43 +05:30
Zarrar
963d62b701 feat: Chart of Accounts Importer (#16623) 
* bare doctype created for COA utility

* improvise doctype's design

* validation to check no transaction exist for the company

* download file and import coa - client side logic added

* download csv template to create custom chart

* read the custom csv uploaded and parse it to appropriate format

* convert list of list to nested tree structure

* preview the uploaded chart before actual import

* toggle field based on necessity

* tweak create_charts and build_json logic to incorporate COA Import utility

* code cleanify and validation call added

* code enhancement for flexibility and validation added

* show import button only if data is validated

* unset existing data and load new accounts

* disable coa fields if parent_company set, minor improv

* file api fix

* added progress bar

* codacy fixes

* fix: Add account number in template

* fix: TDS account exception handling fix
 2019-03-23 10:30:12 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 
feat: Brand Item Defaults (v12)
 2019-03-22 12:46:04 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Rohit Waghchaure
d4e4316d0b fix: test cases and codacy 2019-03-18 14:18:49 +05:30
Zlash65
11bba571af test case added to check account syncing 2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62 fix: chart of accounts field toggling improv 2019-03-18 12:50:29 +05:30
Zlash65
73acb8c837 fix: set chart of accounts based on parent company on server side 2019-03-18 12:50:28 +05:30
Zlash65
88c990901d fix: added validation to if account is being added to child company 2019-03-18 12:50:28 +05:30
Zlash65
a57d58f756 feat: once company is saved, parent_company cannot be selected 2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090 feat: selecting parent_company should disable chart_of_accounts based fields 2019-03-18 12:50:27 +05:30
Saif Ur Rehman
e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
 2019-03-08 01:29:39 +05:00
bcornwellmott
b263876918
Add date to currency exchange caching 
The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)
 2019-03-05 16:44:02 -08:00
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
Rohit Waghchaure
f4049f9dfd fix: user progress issue 2019-02-19 19:46:14 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization 
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
 2019-02-19 10:39:22 +05:30
Rushabh Mehta
20db65ef77
Merge pull request #16694 from rmehta/refactor-comments 
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
 2019-02-18 12:05:35 +05:30
Prateeksha Singh
08a6de6b41 fix(modules): shorten descriptions 2019-02-12 07:41:52 +05:30
Rushabh Mehta
c8018bdeb1 fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891 2019-02-09 21:10:29 +05:30
Saif Ur Rehman
590491779a Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/item.py
 2019-02-02 02:49:04 +05:00
Saif Ur Rehman
00aaa48779 test(Item): test_item_defaults 2019-02-02 02:43:44 +05:00
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Saif Ur Rehman
c8b61007b0 Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults 
# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py
 2019-02-01 17:05:46 +05:00
Sagar Vora
56cbfe4bb0 Merge branch 'master' into develop 2019-01-31 13:34:32 +05:30
Sagar Vora
76728b87ab
fix: value missing for selling settings - sales_update_frequency (#16530) 2019-01-31 08:19:38 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm 
GST Settings permission and regional taxes creation
 2019-01-29 11:27:18 +05:30
Nabin Hait
3ccc16e4e0
Merge pull request #16449 from scmmishra/remove-foundation 
feat: Deprecated In App Help
 2019-01-29 11:20:23 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
scmmishra
3f9b231f31 [fix] Links now redirect to erpnext.com 2019-01-25 12:56:27 +05:30
Nabin Hait
f05d91d317
Merge branch 'develop' into Item-Tax-Template-V12 2019-01-25 11:26:47 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary 
feat: Party Ledger Summary Report
 2019-01-25 11:22:55 +05:30
Nabin Hait
ddc65dfb87 fix: delete taxes and charges template while deleting company 2019-01-25 11:04:14 +05:30
Nabin Hait
2a1aedfff1 fix(setup): Create regional taxes on creation on company 2019-01-24 17:56:19 +05:30
Faris Ansari
badf1c42e0 chore: Add error logging for failed get_exchange_rate call 2019-01-24 16:28:53 +05:30
deepeshgarg007
0c38cf06a5 fix: Wrong argument fix in email digest filters 2019-01-23 19:11:24 +05:30
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
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix 
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
 2019-01-22 10:49:55 +05:30