Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,654 Commits 3 Branches 0 Tags 1 GiB
0983cb75d5
Commit Graph

797 Commits

Author SHA1 Message Date
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
aea0af02aa Merge branch 'master' into slow 2013-07-16 14:28:03 +05:30
Nabin Hait
e724fd45d1 [report] [minor] added warehouse and brand columns in purchase ordered items to be received 2013-07-16 13:23:40 +05:30
Rushabh Mehta
2861e25fb8 Merge branch 'master' of github.com:webnotes/erpnext into slow 
Conflicts:
	stock/doctype/purchase_receipt/purchase_receipt.js
 2013-07-15 20:57:26 +02:00
Nabin Hait
da46a3782f [fix] [minor] get query 2013-07-15 17:52:10 +05:30
Nabin Hait
40cb8fb193 [fix] [minor] Installation Note: pulling from DN and code cleanup 2013-07-15 17:23:49 +05:30
Nabin Hait
a9a914ce97 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 16:33:46 +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
Anand Doshi
4563ef3aea Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 14:49:42 +05:30
Anand Doshi
ce36204129 [minor] [item] on adding image, add description html if it is empty 2013-07-15 14:49:03 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Nabin Hait
87bed52818 [minor] [fix] get_query for cost center 2013-07-12 16:55:03 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Nabin Hait
1ac928ed5c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 16:07:53 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Nabin Hait
c0816d7efe Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 11:58:43 +05:30
Nabin Hait
789976f272 [fix] [stock] batch no query in stock entry 2013-07-11 11:58:20 +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
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Rushabh Mehta
8f61991235 [minor] 2013-07-10 19:02:07 +05:30
Rushabh Mehta
69c1858c24 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:00:30 +05:30
Rushabh Mehta
ad71473f35 [cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix 2013-07-10 18:59:55 +05:30
Rushabh Mehta
982ad35fd2 [cleanup] Removed Warehouse Type 2013-07-10 18:39:06 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Nabin Hait
10b112807c [fix] related to mapping 2013-07-10 16:48: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
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Anand Doshi
c120776931 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
 2013-07-09 13:10:15 +05:30
Anand Doshi
bdee6e074a [cleanup] moved company to top section, hide company if only one exists, changed field labels 2013-07-09 13:03:39 +05:30
Nabin Hait
0f3d2df8e8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-09 12:44:17 +05:30
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Rushabh Mehta
5758f7e3b7 [stock-entry] show gl if auto inventory accounting #561 2013-07-09 12:05:33 +05:30
Akhilesh Darjee
d3c74c1a1b [Cleanup][Report] Added company in Warehouse-wise Stock Balance & removed filters from both reports 2013-07-09 11:51:24 +05:30
Rushabh Mehta
f0e4f9e0c3 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 11:38:37 +05:30
Rushabh Mehta
cfb54ceb43 [material request/purchase order] [bug] required date automatically set #433 2013-07-09 11:38:08 +05:30
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Anand Doshi
6172b6ffb8 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 19:47:55 +05:30
Anand Doshi
3c6d440f09 [bean] [mandatory] fixes in test cases 2013-07-08 19:47:37 +05:30
Nabin Hait
a131c0aa5e [fixed conflict] 2013-07-08 19:01:41 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Anand Doshi
615701d3ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	stock/doctype/material_request/material_request.txt
 2013-07-08 18:54:00 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
304a4a66b4 [production order] [delivery note] fixes, pull 2013-07-08 17:01:32 +05:30
Rushabh Mehta
862a02b8d2 [pull-mappers] no fields via custom button, started with quotation, material request, purchase order 2013-07-08 15:52:24 +05:30
Rushabh Mehta
11eda08cd5 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 12:40:06 +05:30
Rushabh Mehta
436467a5c9 [purchase order] tests pass 2013-07-08 12:37:59 +05:30
Rushabh Mehta
886c9ef5d1 [material requests] [tests] 2013-07-08 12:08:06 +05:30
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
 2013-07-08 11:53:35 +05:30
Nabin Hait
1daad6b1ca [report] added some extra columns 2013-07-08 11:28:59 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Nabin Hait
2d2d800f0f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 18:34:10 +05:30
Nabin Hait
126aedda08 [mapper] 2013-07-05 18:30:16 +05:30
Rushabh Mehta
22bf5f4dbd [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:33:54 +05:30
Rushabh Mehta
e6af313bfa [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:25:17 +05:30
Nabin Hait
1bec8012d2 [conflict] fixed 2013-07-05 15:25:58 +05:30
Nabin Hait
eb883ee7a3 [mapper] purchase cycle 2013-07-05 15:23:47 +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
cba2913ddd [stock ledger entry] [minor] removed print 2013-07-05 12:58:30 +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
8005362c6c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 10:51:51 +05:30
Rushabh Mehta
e953f0bb97 [form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt 2013-07-05 10:48:35 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Nabin Hait
2de1cfc1c1 [mapper] material request - PO/supp quote/stock entry 2013-07-05 10:23:00 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Rushabh Mehta
be2016ba41 [mapper] sales order-sales invoice added condition 2013-07-04 17:52:03 +05:30
Nabin Hait
df1fca9f65 [mapper] material request to purchase order 2013-07-04 17:50:06 +05:30
Rushabh Mehta
8fe97fcbe1 [mapper] sales order-sales invoice 2013-07-04 17:31:06 +05:30
Anand Doshi
8aaccf7269 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/lead/lead.txt
 2013-07-04 17:18:45 +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
Nabin Hait
3ccfb028fe Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:04:48 +05:30
Rushabh Mehta
37805ca415 [mapper] sales order-delivery note, added postprocess function in each doc for mapper.py 2013-07-04 17:03:02 +05:30
Nabin Hait
9010f92eab Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 16:03:24 +05:30
Rushabh Mehta
8aded138c7 [buying] started cleanup, [mapper] started rewrite 2013-07-04 12:50:52 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Nabin Hait
72abfa6b4b Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 11:48:10 +05:30
Anand Doshi
b66891a49d [serial nos] allow rename 2013-07-02 12:07:58 +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
Nabin Hait
71c3f95098 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 18:28:26 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Rushabh Mehta
4cd0a07290 [grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links 2013-07-01 15:17:36 +05:30
Rushabh Mehta
36af6a02ad [grid reports] now show by wn.route_options 2013-07-01 14:35:57 +05:30
Nabin Hait
fdbfe1c274 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 12:20:19 +05:30
Nabin Hait
b5e58ffa26 [rename with merge] updated on_rename function for item, warehouse, al tree type documents 2013-07-01 12:20:00 +05:30
Rushabh Mehta
1bcc19e019 [item] default warehouse is selected with item 2013-07-01 11:46:07 +05:30
Rushabh Mehta
b3f947aca6 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-01 09:36:39 +05:30
Rushabh Mehta
8706ca9445 [journal voucher] [added opening entry] [cleanups] 2013-07-01 09:36:03 +05:30
Anand Doshi
971f30a12b Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-28 19:19:04 +05:30
Rushabh Mehta
03e9a4ea11 [company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller 2013-06-28 12:49:28 +05:30