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

340 Commits

Author SHA1 Message Date
Rushabh Mehta
ffe64db8f7 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 10:41:19 +05:30
Rushabh Mehta
6ca903f62a [minor] [demo] added commits 2013-08-13 14:31:15 +05:30
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Rushabh Mehta
4c17f9420e [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Anand Doshi
b6084f1e78 [fix] [minor] set customer defaults to fetch price list 2013-08-09 15:13:23 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Rushabh Mehta
2c968cecf5 [Production Order] [minor] Cleanup 2013-08-08 14:16:39 +05:30
Rushabh Mehta
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Rushabh Mehta
7c2a2e24a2 [demo] [minor] simulate quotation 2013-08-07 15:08:11 +05:30
Rushabh Mehta
0b50b48104 [salary structure] Cleanup, Fixed Monthly Register Report and other minor changes 2013-08-06 17:53:41 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Rushabh Mehta
7ee90ab4e6 [minor] [translation] Fixed German translations file webnotes/erpnext#509 2013-08-05 13:45:41 +05:30
Rushabh Mehta
2b76a5e82a [minor] fixes to data import tool, docs and lead 2013-08-02 15:16:59 +05:30
Rushabh Mehta
cbf9cfe725 [fix] [minor] system manager role check 2013-07-31 09:52:28 +05:30
Rushabh Mehta
e3742322fb Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 16:20:19 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
5e200e43a6 [minor] duplicate row id from same prevdoc 2013-07-29 15:29:51 +05:30
Anand Doshi
c7280b4973 [fix] [minor] fetch supplier default currency only if it exists 2013-07-29 11:48:28 +05:30
Anand Doshi
2b518e37e5 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:34:38 +05:30
Anand Doshi
6c0b936f35 [minor] [fix] set customer and supplier defaults 2013-07-26 11:32:26 +05:30
Rushabh Mehta
c4f5e4fd3f [docs] remove attributions from page and added to docs 2013-07-26 11:21:45 +05:30
Rushabh Mehta
152cecc9cd Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 17:47:38 +05:30
Anand Doshi
f2045fb92e [fix] [minor] set customer/supplier defaults 2013-07-25 17:46:02 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Anand Doshi
85fa3d2bb9 [fix] [minor] upload callback arguments changed 2013-07-25 16:02:15 +05:30
Nabin Hait
8c0485d085 [fix] [minor] fix in sending sms from transactions 2013-07-24 16:56:03 +05:30
Nabin Hait
02a3d7ac12 [minor] [fix] fetching contact details 2013-07-24 16:33:30 +05:30
Anand Doshi
ba8ea7dbfd [minor] [fix] fetch contact details 2013-07-24 12:08:42 +05:30
Nabin Hait
deff57826a [minor] [fix] fetch contact details 2013-07-24 11:30:35 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Anand Doshi
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Anand Doshi
63d844b2d2 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py
 2013-07-10 20:55:15 +05:30
Anand Doshi
2ac0a83bd8 [webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order 2013-07-10 20:49:44 +05:30
Rushabh Mehta
982ad35fd2 [cleanup] Removed Warehouse Type 2013-07-10 18:39:06 +05:30
Nabin Hait
6e68e0e5d8 [fix] validate with prev doc 2013-07-10 15:33:29 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Rushabh Mehta
11d688a536 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 15:14:15 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
ef8d3bcb77 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 12:57:41 +05:30
Anand Doshi
901773a139 [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files 2013-07-05 12:57:03 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Anand Doshi
99100a4135 [webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation 2013-07-04 17:13:53 +05:30
Anand Doshi
15db6c4659 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
 2013-07-02 11:50:32 +05:30
Anand Doshi
2023012b0e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	utilities/doctype/address/address.txt
 2013-07-02 11:43:54 +05:30
Anand Doshi
edbf3e1e19 [webshop] [addresses] address selector, my addresses list 2013-07-02 11:40:16 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Nabin Hait
ac24d0fa98 [fixes] ignore single doctypes in chekcing linked documents 2013-07-01 14:03:08 +05:30
Anand Doshi
8f9f8a43c7 [lead] [address] store lead address in Address doctype, with link field=lead 2013-06-28 19:18:33 +05:30
Nabin Hait
b164edc16f [fix] cleanup data 2013-06-28 13:03:39 +05:30
Anand Doshi
aa0ccf8223 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-17 13:46:55 +05:30
Anand Doshi
b5fd788131 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-17 12:55:05 +05:30
Anand Doshi
11d311376e [event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue 2013-06-17 12:51:36 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
aa069565de [docs] added for support module 2013-06-11 10:53:03 +05:30
Rushabh Mehta
c2e20dcf7c [docs] added README.md files for website, utilities 2013-06-11 10:43:20 +05:30
Rushabh Mehta
a40c60ea3e [cleanup] removed Trash Control, SMS Receiver, Profile Control, GL Mapper, GL Mapper Detail 2013-06-11 10:43:00 +05:30
Anand Doshi
097ac352d6 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 15:38:31 +05:30
Anand Doshi
670199b9c6 [patch] [fix] event for project, oppty, lead 2013-06-10 15:38:01 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-10 15:25:07 +05:30
Anand Doshi
e53a81dcea [event] [lead, opportunity, project] [fix] create events 2013-06-10 15:15:40 +05:30
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Anand Doshi
e961af40fc [transaction] [fix] fix in purchase transactions 2013-05-31 14:30:46 +05:30
Anand Doshi
5d74c82c06 Merge branch 'webshop' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/quotation/quotation.js
 2013-05-28 17:46:50 +05:30
Anand Doshi
923d41dfd2 [selling/buying] [fixes] fixes in client side code, server side code, print formats 2013-05-28 17:23:36 +05:30
Anand Doshi
fc77718a3d [selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying 2013-05-27 19:29:07 +05:30
Anand Doshi
5dfba486a6 [note] [fix] strip invalid characters from title and set it as the name of the note 2013-05-27 12:25:28 +05:30
Rushabh Mehta
43c51b63c4 [form] added print email buttons, fixes to editor, note 2013-05-24 16:52:21 +05:30
Rushabh Mehta
9c5f4fe165 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:10 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Rushabh Mehta
9b10e362f7 [form/list] ui fixes, [note] new table to merge question + answer 2013-05-24 16:00:56 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Anand Doshi
1dde46aff0 [buying, selling] [refactor] get item details 2013-05-15 21:15:57 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Anand Doshi
2aa9724c6a Merge branch 'master' into pos_fetch 2013-05-01 13:07:42 +05:30
Anand Doshi
ce3296fc87 [rename tool] [fix] condition to validate that content exists in a row of the uploaded file 2013-04-29 12:28:19 +05:30
Anand Doshi
edc5f2edd0 [sales invoice] [fetching] fetch pos values and customer address contact values 2013-04-26 17:21:49 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Rushabh Mehta
ac118c8822 [cleanup] started responsive layouts and removed tinymce 2013-04-15 17:02:20 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Nabin Hait
6de5eb466c role added in some pages 2013-04-09 11:52:18 +05:30