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

836 Commits

Author SHA1 Message Date
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
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
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
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Nabin Hait
e03e38db1e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 11:36:41 +05:30
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Rushabh Mehta
8f050f4cd3 [sales invoice] payment section visible only if is_pos is true #382 2013-07-09 11:28:47 +05:30
Anand Doshi
6172b6ffb8 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 19:47:55 +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
7eee8531b2 [mapper-pull] for sales / purchae 2013-07-08 18:03:40 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +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
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
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Rushabh Mehta
8f48db33d2 [sales invoice] added progress bar of payment 2013-07-05 16:54:40 +05:30
Rushabh Mehta
f7de376932 [sales invoice] added progress bar of payment 2013-07-05 16:50:43 +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
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
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
Anand Doshi
0b4943cec1 [webshop] shopping cart with shipping rule selector, totals 2013-07-04 23:45:22 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Anand Doshi
f4d8d23241 [setup] [fix] creation of fiscal year if start date is 1st Jan 2013-07-04 18:29:55 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Nabin Hait
151b0bd153 [merge conflict] 2013-07-04 17:56:28 +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
9010f92eab Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 16:03:24 +05:30
Nabin Hait
19f2396f95 Update Purchase Receipt-Purchase Invoice.txt 2013-07-04 14:56:50 +05:30
Nabin Hait
7dc77f764f Update Purchase Order-Purchase Invoice.txt 2013-07-04 14:56:29 +05:30
Nabin Hait
e2dd800999 Update purchase_register.py 2013-07-04 14:37:58 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Nabin Hait
18f754d53c Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 13:31:15 +05:30