Commit Graph

265 Commits

Author SHA1 Message Date
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Nabin Hait
57916252d9 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 15:35:03 +05:30
Akhilesh Darjee
7e062b3352 barcode error in sales_invoice fixed. 2013-03-25 12:28:39 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Rushabh Mehta
3f725308e1 [website] [number_format] [fix] moved js function & added amount to order list 2013-03-22 14:56:31 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
6f1dd26100 on deletion of lead, delete communication reference 2013-03-18 11:15:31 +05:30
Anand Doshi
4127bb14ed Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 12:48:10 +05:30
Nabin Hait
0cfbc5feb5 fixes in sales order test cases and set_buying_amount 2013-03-12 11:34:56 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Nabin Hait
0e6ce9af17 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 18:50:23 +05:30
Nabin Hait
4f12923903 fixes in sales team percentage validation 2013-03-07 18:49:50 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Rushabh Mehta
ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:20:24 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Nabin Hait
37731471fd lead organization added in quotation classic/spartan/modern print format 2013-03-05 11:59:20 +05:30
Rushabh Mehta
ba0e1ea194 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 19:09:38 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Nabin Hait
6054ae2bec delete gross profit based on search criteria 2013-02-26 10:51:24 +05:30
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
defd0e15f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 17:55:22 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Anand Doshi
3e38d36580 fixes in sales email pulling 2013-02-22 13:08:14 +05:30
Anand Doshi
ff20067a6f Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 12:52:02 +05:30
Anand Doshi
5b859d84a1 fix in sales communication 2013-02-22 12:51:27 +05:30
Nabin Hait
8a14cdb45d Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 12:45:40 +05:30
Nabin Hait
87d270a5b5 refactored code for reserved qty with testcases 2013-02-22 12:44:51 +05:30
Anand Doshi
d2b2174ee4 removed last sales order update in customer 2013-02-22 01:44:52 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Nabin Hait
c924c1ebb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:53:42 +05:30
Nabin Hait
9082fad994 testcases for reserved qty 2013-02-21 14:49:44 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Nabin Hait
8f7899a642 added stopped condition in pending to deliver/received/billed report 2013-02-21 11:44:08 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Nabin Hait
39fc5179f9 display customer name instead of customer id in quotation print format 2013-02-19 15:47:19 +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
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry 2013-02-14 13:38:12 +05:30
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30