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

695 Commits

Author SHA1 Message Date
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Rushabh Mehta
3423a73009 [serial no] Allow creation only of Warehouse is not set, [translation] Italian 2013-08-16 13:03:34 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +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
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +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
Rushabh Mehta
43d7de8cdc Merge branch 'master' of github.com:webnotes/erpnext 2013-08-08 07:41:25 +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
Rushabh Mehta
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Rushabh Mehta
0cb97f3627 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 15:08:37 +05:30
Rushabh Mehta
7c2a2e24a2 [demo] [minor] simulate quotation 2013-08-07 15:08:11 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
Nabin Hait
1107f20dd6 [fix] [minor] bug fixed _ imported 2013-08-07 14:33:32 +05:30
Nabin Hait
8daa702a90 Merge branch 'master' into perpetual 2013-08-07 12:46:50 +05:30
Nabin Hait
74506ba060 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 12:36:13 +05:30
Nabin Hait
c478349379 [fix] [minot] reserved warehouse mandatory validation for packing items 2013-08-07 12:35:45 +05:30
Anand Doshi
fbe1e167d4 [fix] [selling] reduce round-off loss when using tax inclusive price 2013-08-06 19:38:19 +05:30
Nabin Hait
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Rushabh Mehta
5eedde191f [mapper] [minor] idx fix for multiple pulls webnotes/erpnext#651 2013-08-06 12:40:23 +05:30
Anand Doshi
b9eb0849c3 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-06 11:55:15 +05:30
Anand Doshi
d505940b18 [fix] [minor] [query] get sales bom item code 2013-08-06 11:54:26 +05:30
Nabin Hait
ae6720be02 Update sales_order.py 2013-08-06 11:22:14 +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
5013dcb12c [fix] [minor] change_grid_labels 2013-08-05 12:16:04 +05:30
Anand Doshi
edfba96ce1 [fix] [minor] show company currency fields if included_in_print_rate is checked 2013-08-05 11:56:54 +05:30
Anand Doshi
33fe86777c [usability] Allow user to edit Price List if this option is checked in Selling Settings [issue] webnotes/erpnext#707 2013-08-02 12:39:10 +05:30
Nabin Hait
bbe1448fca Merge branch 'master' into perpetual 2013-08-02 11:53:00 +05:30
Nabin Hait
8db287449f [cleanup] code commonified of making sl entry 2013-08-02 11:44:52 +05:30
Nabin Hait
cac622e097 [accounts] [perpetual] get account and stock balance difference 2013-08-02 11:44:29 +05:30
Anand Doshi
c4a54fe24e [usability] [issue] webnotes/erpnext#346 - hide packing list if it is empty 2013-08-01 18:19:51 +05:30
Nabin Hait
2d57e51112 [fix] [minor] null issue 2013-07-31 17:31:23 +05:30
Rushabh Mehta
e3742322fb Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 16:20:19 +05:30
Rushabh Mehta
ed186b719e [demo] [minor] Started make_demo.py 2013-07-30 16:19:40 +05:30
Anand Doshi
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +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
Nabin Hait
de72b44d28 [fix] [minor] pull only undelivered items in Dn from SO 2013-07-30 12:54:22 +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
f90df7da02 [fix] [minor] if customer_account is mentioned in POS Settings, also fetch customer_name 2013-07-29 19:53:44 +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
25647c4375 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	patches/patch_list.py
 2013-07-29 13:31:00 +05:30
Anand Doshi
d5d39ac5ec [fix] [minor] sales and purchase get_queries 2013-07-29 13:28:37 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +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
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +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
Rushabh Mehta
c97fe01837 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:14:18 +05:30
Nabin Hait
ea51b41239 [fix] [minor] allowed territory group in all transactions 2013-07-25 18:01:13 +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
Nabin Hait
23a64d7f9d [minor] removed customer validation between quotation and SO 2013-07-24 16:19:54 +05:30
Anand Doshi
ba8ea7dbfd [minor] [fix] fetch contact details 2013-07-24 12:08:42 +05:30
Nabin Hait
deff57826a [minor] [fix] fetch contact details 2013-07-24 11:30:35 +05:30
Nabin Hait
64a9d0ccef Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 15:31:57 +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
ed69892a0a [minor] [query] sales person 2013-07-23 15:16:50 +05:30
Anand Doshi
1dc95ed865 [minor] [selling] [fix] fetch available qty for given warehouse 2013-07-23 13:36:38 +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
5fa994f7a1 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 17:15:16 +05:30
Nabin Hait
d351318014 [minor] [fix] employee field while new sales person created from tree 2013-07-22 17:15:01 +05:30
Anand Doshi
7dd5034b03 [minor] [fix] [issue] #624 2013-07-22 16:36:11 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Nabin Hait
50f5fd13c7 [feature] [selling] customer discount item_group wise 2013-07-22 13:10:13 +05:30
Anand Doshi
95391b176a [minor] [fix] [issue] #618 2013-07-19 16:48:00 +05:30
Anand Doshi
648fd16e98 [minor] [fix] #616 2013-07-19 14:15:58 +05:30
Anand Doshi
573b423a6c Merge branch 'master' of github.com:webnotes/erpnext 2013-07-18 13:26:53 +05:30
Anand Doshi
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Nabin Hait
55b5dd2f10 [fix] [mapper] 2013-07-18 13:05:14 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +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
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Anand Doshi
cefccb921e [minor] [webshop] [fix] 2013-07-15 18:28:14 +05:30
Nabin Hait
40cb8fb193 [fix] [minor] Installation Note: pulling from DN and code cleanup 2013-07-15 17:23:49 +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
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Anand Doshi
9b4961400a [minor] [fix] get queries 2013-07-11 19:13:58 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +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
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
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
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
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
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
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +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
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +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
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
b4c68531ea [pull-mappers] sales order 2013-07-08 15:58:50 +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
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
70eda07bcf [report] deleted duplicate report 2013-07-08 11:33:09 +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
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Nabin Hait
2b3ca41450 [mapper] support 2013-07-07 12:32:01 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Nabin Hait
fcd9434daf [mapper] 2013-07-06 18:25:36 +05:30
Nabin Hait
2d2d800f0f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 18:34:10 +05:30
Nabin Hait
126aedda08 [mapper] 2013-07-05 18:30:16 +05:30
Anand Doshi
29ea5d014e [sales common] [fix] calculate outstanding amount only for docstatus=0 on client side 2013-07-05 17:23:14 +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
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Rushabh Mehta
be2016ba41 [mapper] sales order-sales invoice added condition 2013-07-04 17:52:03 +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
Rushabh Mehta
37805ca415 [mapper] sales order-delivery note, added postprocess function in each doc for mapper.py 2013-07-04 17:03:02 +05:30
Rushabh Mehta
212de6a084 [mapper] added sales order > material request, added postprocess function 2013-07-04 16:29:03 +05:30
Rushabh Mehta
080fcc8fcd [mapper] quotation-sales order for mapping in parent + child items 2013-07-04 15:27:04 +05:30
Rushabh Mehta
8aded138c7 [buying] started cleanup, [mapper] started rewrite 2013-07-04 12:50:52 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Rushabh Mehta
9a04b19160 [form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation 2013-07-03 13:27:39 +05:30
Rushabh Mehta
78979dca9b [form] added icon in section break 2013-07-03 10:32:33 +05:30
Rushabh Mehta
e6bf83e653 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-02 18:14:07 +05:30
Rushabh Mehta
2eb7ceabda [forms] cleanup, fixing usability and added form dashboard 2013-07-02 18:13:26 +05:30
Anand Doshi
15db6c4659 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
 2013-07-02 11:50:32 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Anand Doshi
169cfafe13 [customer] [fix] link customer in lead's address when creating customer from lead 2013-06-29 17:24:27 +05:30
Anand Doshi
8f9f8a43c7 [lead] [address] store lead address in Address doctype, with link field=lead 2013-06-28 19:18:33 +05:30
Saurabh
d6cc5cd08f [Trends Teports] cleanup 2013-06-28 10:09:46 +05:30
Anand Doshi
77cd10b10a [selling] added shipping rule link besides taxes master link field 2013-06-27 12:17:34 +05:30
Akhilesh Darjee
89bd216a0c [Fix] SMS Center 2013-06-26 18:28:54 +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
8bef70cceb Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 13:53:17 +05:30
Anand Doshi
bd7218979e [shipping rule] added doctypes shipping rule and shipping rule conditions 2013-06-26 13:53:01 +05:30
Nabin Hait
e26acffcfe [report] available qty for packing items 2013-06-26 13:47:11 +05:30
Akhilesh Darjee
e05e6a114e [Fix]SMS Center Cell Number 2013-06-25 18:00:30 +05:30
Rushabh Mehta
e08f1bc034 [email] [fix] decode subject 2013-06-25 16:21:58 +05:30
Rushabh Mehta
9132de5e4c [global defaults] breakup added buying settings and selling settings 2013-06-25 11:54:37 +05:30
Rushabh Mehta
d242a8babd [patch] breakup global defaults 2013-06-25 11:46:07 +05:30
Akhilesh Darjee
78e622ef5c Deleted search criteria 2013-06-25 11:08:19 +05:30
Akhilesh Darjee
a19014a846 Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report 2013-06-24 19:05:16 +05:30
Rushabh Mehta
7a93d5de30 [bug fixes] [global defaults] [cleanup] 2013-06-24 18:18:46 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Nabin Hait
82366d3bb8 [report] deleted old reports based on search_criteria 2013-06-24 14:31:56 +05:30
Nabin Hait
4cd977a2a9 [fixes] pull previous doc details 2013-06-24 12:20:35 +05:30
Anand Doshi
61a2f68bc6 [webshop] territories in price list, taxes, updates in shopping cart settings 2013-06-21 17:55:31 +05:30
Nabin Hait
99fd749334 [report][cleanup] pending so items for purchase request 2013-06-21 16:56:32 +05:30
Saurabh
36cb3caaa7 [Pending so Items for purchase receipt] 2013-06-21 16:25:28 +05:30
Akhilesh Darjee
64c8e28423 [Fixed] Merge conflict fixed 2013-06-21 13:09:18 +05:30
Akhilesh Darjee
1ded5c618e [Report]Cleanup of territory target variance, sales person target variance & budget variance reports 2013-06-21 12:47:51 +05:30
Anand Doshi
d52b03a8cc Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
 2013-06-21 12:22:52 +05:30
Saurabh
7989deda20 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-21 10:54:12 +05:30
Saurabh
f8f68c54d9 [trends analyzer] cleanup completed 2013-06-20 18:52:31 +05:30
Nabin Hait
0930b94264 [target report] cleanup 2013-06-20 16:35:09 +05:30
Nabin Hait
739a7fdf74 Merge pull request #494 from akhileshdarjee/master 
[Report] Completed Territory Target Variance & Sales Person Target Variance reports
 2013-06-20 02:53:31 -07:00
Akhilesh Darjee
e6974d10c2 Fixed conflict merge 2013-06-20 15:22:04 +05:30
Nabin Hait
b8ebbcafa9 [trend analyzer] cleanup 2013-06-20 13:03:10 +05:30
Nabin Hait
616657d4a2 Merge pull request #495 from saurabh6790/master 
[erpnext][reports][Trend Analyzer]
 2013-06-19 22:18:44 -07:00
Akhilesh Darjee
92571c6929 [Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report 2013-06-19 18:15:20 +05:30
Anand Doshi
c2a352711f [shopping cart] show items, editable qty and show amount for that item 2013-06-19 17:19:20 +05:30
Akhilesh Darjee
4ddc2618e8 [Report] Completed Sales Person Target Variance (Item-Group wise) 2013-06-18 18:46:02 +05:30
Anand Doshi
ca628d9f54 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/sales_order/sales_order.txt
 2013-06-18 18:30:41 +05:30
Anand Doshi
3c6c3cf5ee [sales order] [shipping address] allow to edit shipping address 2013-06-18 18:26:30 +05:30
Akhilesh Darjee
2967581102 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-17 19:27:30 +05:30
Akhilesh Darjee
f841a7bc14 Completed territory_target_variance(item_group_wise) report 2013-06-17 19:25:48 +05:30
Anand Doshi
e81321219e [webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods 2013-06-17 15:42:38 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
abc100302c [cart] create quotation on checkout 2013-06-14 17:44:03 +05:30
Saurabh
feb8669cbd [Reports][Validation changes in Purchase and Sales trends] 2013-06-14 17:40:48 +05:30
Saurabh
606d8383ff Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-14 16:48:41 +05:30
Saurabh
1848b71a0a [Reports][Sales and Purchase Trends][Completed] 2013-06-14 15:03:45 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +05:30
Saurabh
f9966f44cd [Report][Quotation Trend Complete] 2013-06-12 17:55:19 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Saurabh
bcbd9a4800 [Report][Quotation Trend] 2013-06-11 18:06:58 +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
3b867f7377 [cleanup] [fix] removed amendment_date 2013-06-11 17:21:11 +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
f85368ec5e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:07:44 +05:30
Anand Doshi
618edee8b7 [search criteria] [cleanup] removed search criteria folders and files 2013-06-11 15:04:37 +05:30
Anand Doshi
5c069050d5 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 14:34:45 +05:30
Anand Doshi
433047b2e2 [customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1 2013-06-11 14:28:42 +05:30