Commit Graph

169 Commits

Author SHA1 Message Date
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Anand Doshi
3daf45fcd8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 17:34:18 +05:30
Anand Doshi
2e0cc41fc6 [chart of accounts/cost center] [add account/cost center] fix in permission issue 2013-06-11 17:33:37 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
95e46bc930 [docs] for home, buying modules 2013-06-11 15:12:51 +05:30
Rushabh Mehta
0ab1bdf94e [cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options 2013-06-11 12:35:46 +05:30
Anand Doshi
27a981677e [buying] [cleanup] deprecated load_default_taxes and get_purchase_tax_details 2013-06-10 16:32:55 +05:30
Anand Doshi
ed5f876349 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 16:28:03 +05:30
Anand Doshi
0175fbd470 [buying] [purchase taxes] get cost center from taxes master 2013-06-10 16:27:29 +05:30
Anand Doshi
b392878f15 [buying] [fix] store item tax amount only if field exists 2013-06-05 17:46:20 +05:30
Anand Doshi
12cea9587f [terms and conditions] removed terms html and added terms and conditions to purchase invoice 2013-06-05 14:59:28 +05:30
Anand Doshi
bf3e54a45b [issues #437] [fix] pulling terms and conditions 2013-06-05 14:11:32 +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
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
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Anand Doshi
2168e39bf3 [selling/buying] set dynamic labels 2013-05-23 19:25:08 +05:30
Anand Doshi
4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt
2013-05-23 15:22:47 +05:30
Nabin Hait
b7e07ac6a5 [fixes] updated no_copy field 2013-05-22 12:10:16 +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
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Rushabh Mehta
3aeed95e0a [customer/supplier] [address] extended list to 5 2013-05-02 11:39:46 +05:30
Rushabh Mehta
ecb36f2cb0 [purchase] [validation] validate warehouse belongs to company if set 2013-05-02 11:34:37 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Anand Doshi
e60f4560d1 [supplier] [fix] on_trash sql syntax fix 2013-04-04 14:00:56 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Anand Doshi
88ac485541 minor fixes in utils, purchase common and task 2013-03-11 14:57:45 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Nabin Hait
e1f99586fd fixes in price list for purchase 2013-03-06 14:24:03 +05:30
Rushabh Mehta
c9e32e6c8d fixed patches for new sync 2013-03-06 11:30:09 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Nabin Hait
0d20d6fdd2 fixes for purchase price list 2013-03-04 15:35:45 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Nabin Hait
15e7c18639 fixes in price list currency 2013-02-28 18:10:19 +05:30
Nabin Hait
a71ace0d74 fixed asynchronus issue in purchase cycle 2013-02-28 16:30:53 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
cf05580f8e fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled 2013-02-20 18:44:10 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30