Commit Graph

489 Commits

Author SHA1 Message Date
Anand Doshi
17350b899f [fix] [mapper] from delivery note to sales invoice, only map unbilled items 2013-08-01 15:45:23 +05:30
Anand Doshi
74458a93bb [minor] [issue] webnotes/erpnext#405 - removed chat link for self-hosted instances 2013-08-01 12:10:09 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Anand Doshi
f314051e30 Merge branch 'master' of github.com:webnotes/erpnext into custom_script_defer 2013-07-30 10:44:07 +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
1f996c3121 [minor] currency trigger should not be called in refresh 2013-07-29 19:02:09 +05:30
Anand Doshi
d5d39ac5ec [fix] [minor] sales and purchase get_queries 2013-07-29 13:28:37 +05:30
Anand Doshi
af1df68c13 [cleanup] [minor] added icons in toolbar menu [issue] webnotes/erpnext#655 2013-07-26 15:11:55 +05:30
Anand Doshi
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +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
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
28d59a046a [minor] [fix] [navbar] replace overflow with ellipsis 2013-07-19 17:50:25 +05:30
Anand Doshi
535d833523 [minor] [fix] call company trigger in onload for a new selling/buying transaction 2013-07-19 13:51:07 +05:30
Anand Doshi
82e006917a [minor] [fix] get queries 2013-07-19 12:54:33 +05:30
Anand Doshi
3af8f8a136 [minor] [erpnext logo] load it as object instead of image 2013-07-18 19:52:06 +05:30
Anand Doshi
674765a641 [minor] [erpnext logo] load it as object instead of image 2013-07-18 19:28:46 +05:30
Anand Doshi
04750d9fe2 Merge branch 'slow' of github.com:webnotes/erpnext 2013-07-18 18:17:06 +05:30
Anand Doshi
c8b2c0f091 [minor] [fix] net_total_export printing and hover effect for brand in navbar 2013-07-18 18:15:56 +05:30
Nabin Hait
3f0b31442f [fix] [minor] features setup 2013-07-18 15:11:29 +05:30
Nabin Hait
d89a733506 [fix] [minor] features setup 2013-07-18 15:04:29 +05:30
Anand Doshi
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Anand Doshi
64f316bd2f [minor] [fix] in get item wise tax html, show empty cell if not tax for an account head for a particular item 2013-07-17 15:12:22 +05:30
Anand Doshi
cc04a17030 [minor] show brand html in toolbar 2013-07-17 14:15:26 +05:30
Anand Doshi
9c2bb0e1db [minor] [fix] autoset abbreviation if company name is set in complete setup 2013-07-16 16:56:28 +05:30
Anand Doshi
c8f4bda9a2 [minor] [fix] close button in appframe 2013-07-16 16:51:55 +05:30
Anand Doshi
1d5fa40ff2 [minor] [fix] close button in appframe 2013-07-16 16:47:38 +05:30
Anand Doshi
1ffc5b576c [minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List 2013-07-15 18:09:43 +05:30
Rushabh Mehta
0e31093bdc Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 12:17:35 +05:30
Rushabh Mehta
03be82f41a [minor] [css] #574 2013-07-11 10:22:07 +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
e41bceb3df [feature] [website] Create Default Home Page 2013-07-10 20:42:44 +05:30
Rushabh Mehta
982ad35fd2 [cleanup] Removed Warehouse Type 2013-07-10 18:39:06 +05:30
Anand Doshi
afad0efca3 [minor] [fix] trigger startup after page route in app.js so that dialogs created in startup do not auto-close 2013-07-10 12:00:26 +05:30
Rushabh Mehta
30d3dcb258 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 14:37:28 +05:30
Rushabh Mehta
3ed351df8e [feature] generate latest updates page from git commit log 2013-07-09 14:36:41 +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
5758f7e3b7 [stock-entry] show gl if auto inventory accounting #561 2013-07-09 12:05:33 +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
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
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
4cd0a07290 [grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links 2013-07-01 15:17:36 +05:30
Rushabh Mehta
5381bdd730 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 17:21:03 +05:30
Rushabh Mehta
2f7e1abd0f [setup] new page + minor fixes 2013-06-26 17:20:12 +05:30
Anand Doshi
70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json
2013-06-26 14:07:29 +05:30
Anand Doshi
b802050cd4 [grid report] round currency values 2013-06-26 12:05:37 +05:30
Nabin Hait
13f2e4d8d7 [fix][transaction.js] syntax error 2013-06-25 10:56:39 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30