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

396 Commits

Author SHA1 Message Date
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +05:30
Pratik Vyas
5e16a69b35 mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Akhilesh Darjee
c96c13af4e [fix] make demo for price list 2013-09-12 19:19:46 +05:30
Anand Doshi
3a6f4f882a [fix] [minor] communication related cleanup 2013-09-12 19:10:05 +05:30
Anand Doshi
24416f92cc [fix] [minor] Set Purchase Order Date as No Copy 2013-09-12 18:35:23 +05:30
Akhilesh Darjee
fb6d410e60 [fix] test cases fix for price list 2013-09-11 16:18:10 +05:30
Akhilesh Darjee
c3ec72c991 [fix] [minor] merge conflict fixed 2013-09-11 14:49:38 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Anand Doshi
9686b937bb [fix] [minor] print hide communication table 2013-09-10 10:54:34 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30
Nabin Hait
2e131e26d4 [fix] [minor] Taxes and charges added/deducted only if category in "Valuation and Total" or "Total" 2013-09-02 18:07:53 +05:30
Rushabh Mehta
96690ebd0f [communication] [minor] cleaed model 2013-09-02 17:04:27 +05:30
Nabin Hait
f68d563a68 [minor] fixed conflict while merging with master 2013-08-21 17:49:26 +05:30
Rushabh Mehta
20a109452a [buying] [manufacturing] Added new Reports and fixes for demo 2013-08-20 15:18:42 +05:30
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +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
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Anand Doshi
5a8a63058e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 20:19:26 +05:30
Anand Doshi
1c77745d05 [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +05:30
Nabin Hait
cf5c9a1f59 [minor] [fix] uom conversion factor should be mapped from PO to PR to PI 2013-08-07 17:31:47 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
078129f58f [fix] [minor] removed default from conversion_rate 2013-08-01 16:54:32 +05:30
Anand Doshi
482f34302e [minor] purchase order - no_copy=0 for purchase other charges, so that the field could be mapped 2013-08-01 12:28:21 +05:30
Anand Doshi
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +05:30
Nabin Hait
de72b44d28 [fix] [minor] pull only undelivered items in Dn from SO 2013-07-30 12:54:22 +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
Anand Doshi
d5d39ac5ec [fix] [minor] sales and purchase get_queries 2013-07-29 13:28:37 +05:30
Nabin Hait
834a4db596 [feature] pull from material request based on supplier 2013-07-26 19:45:22 +05:30
Rushabh Mehta
dea6e51929 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-26 11:22:09 +05:30
Rushabh Mehta
c4f5e4fd3f [docs] remove attributions from page and added to docs 2013-07-26 11:21:45 +05:30
Anand Doshi
52b049145b [fix] [minor] call refresh_fields after cur_frm.call when doc is passed 2013-07-25 19:13:45 +05:30
Anand Doshi
742b55f700 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:53:50 +05:30
Anand Doshi
60403b2d8f [fix] [minor] [grid] set_colum_disp should force refresh the whole grid 2013-07-25 18:53:22 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Anand Doshi
396d40c34e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-24 12:11:21 +05:30
Anand Doshi
ba8ea7dbfd [minor] [fix] fetch contact details 2013-07-24 12:08:42 +05:30
Nabin Hait
434f0a41bf [fix] [minor] syntax error in quality inspection 2013-07-24 12:04:01 +05:30
Nabin Hait
deff57826a [minor] [fix] fetch contact details 2013-07-24 11:30:35 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
2fdd874cae Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 11:02:22 +05:30
Anand Doshi
f577b09b3b [minor] [fix] sales and purchase analytics 2013-07-23 11:01:27 +05:30
Nabin Hait
9481e037d2 [minor] [fix] pull uom conversion factor in purchase cycle 2013-07-22 17:28:11 +05:30
Nabin Hait
461b417871 [minor] [fix] trigger in supplier address and contact person field 2013-07-20 18:29:45 +05:30
Anand Doshi
01c837cd2d [minor] [buying] show price list link in buying home 2013-07-19 22:18:27 +05:30
Anand Doshi
75b2d418c1 [minor] [fix] conversion rate shoulld be copied when mapping 2013-07-19 22:05:17 +05:30
Nabin Hait
55b5dd2f10 [fix] [mapper] 2013-07-18 13:05:14 +05:30
Anand Doshi
80166e26cc [minor] [selling/buying] use script_manager.trigger instead of calling cscript function directly post item details fetch, so that custom code can be executed 2013-07-17 14:49:13 +05:30
Nabin Hait
da46a3782f [fix] [minor] get query 2013-07-15 17:52:10 +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
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +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
Rushabh Mehta
278f961daf [minor] [fix] doctype recursive 2013-07-11 12:35:42 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +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
Nabin Hait
3093e6fd39 Merge pull request #568 from akhileshdarjee/responsive 
[Fix][Purchase Order]Warehouse in Item grid to call get_projected_qty
 2013-07-10 03:05:42 -07:00
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
2deca5f3f6 queries to server side 2013-07-10 14:31:29 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
919b9fcccf [cleanup] Maintenance Schedule, Maintenance Visit 2013-07-10 13:06:14 +05:30
Akhilesh Darjee
0c9a7a0a13 [Fix]Warehouse in Item grid of Purchase Order to call get_projected_qty 2013-07-10 12:54:32 +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
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
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
Saurabh
ebe50397d9 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-09 10:18:39 +05:30
Saurabh
7f00f7f89b [get_query] to server side 2013-07-09 10:08:18 +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
Saurabh
028755941e get_query to server side 2013-07-08 18:45:55 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +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
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
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
Nabin Hait
126aedda08 [mapper] 2013-07-05 18:30:16 +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
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +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
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