Anand Doshi
|
6c7f3db755
|
[report] [issue] #641 - added customer name and supplier name in accounts receivable and accounts payable reports respectively
|
2013-07-24 16:49:11 +05:30 |
|
Anand Doshi
|
56421289cc
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-23 17:16:22 +05:30 |
|
Anand Doshi
|
fafb9a8843
|
[fix] [report] general ledger - group by ledger and group by voucher
|
2013-07-23 17:13:55 +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
|
648a5c7e33
|
[fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse
|
2013-07-23 12:07:55 +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 |
|
Anand Doshi
|
21503f8fb9
|
[minor] [fix] on row add processing, [cleanup] shifted validate link and fetch to script_manager
|
2013-07-22 13:38:28 +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
|
6fa5e42b40
|
[minor] [fix] [issue] #617
|
2013-07-19 15:33:11 +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
|
c8b2c0f091
|
[minor] [fix] net_total_export printing and hover effect for brand in navbar
|
2013-07-18 18:15:56 +05:30 |
|
Nabin Hait
|
5b43b3dca5
|
merged with slow branch
|
2013-07-18 12:28:09 +05:30 |
|
Nabin Hait
|
6f61e2c426
|
[fix] [minor] net_total on sales/purchase register
|
2013-07-16 18:47:06 +05:30 |
|
Nabin Hait
|
6a3b951352
|
[accounts] [feature] optional checkbox for same rate validation in sales cycle
|
2013-07-16 18:34:35 +05:30 |
|
Nabin Hait
|
9a380ef40a
|
[fix] [minor] get_query of tax account
|
2013-07-16 17:24:17 +05:30 |
|
Nabin Hait
|
496219ce6b
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-16 14:40:40 +05:30 |
|
Nabin Hait
|
cf1829d21c
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-07-16 14:39:39 +05:30 |
|
Nabin Hait
|
cbc96d5d14
|
[fix] [report] accounts receivable/payable
|
2013-07-16 13:13:38 +05:30 |
|
Nabin Hait
|
642634f6c8
|
[fix] [report] sales/purchase register: if income/expense account entered in tax table for discount
|
2013-07-16 12:11:00 +05:30 |
|
Anand Doshi
|
05859ad42e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-15 18:30:02 +05:30 |
|
Nabin Hait
|
00dadc8bd5
|
[fix] [minor] get query
|
2013-07-15 18:16:37 +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 |
|
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 |
|
Nabin Hait
|
8faa90fb20
|
[fix] [minor] add customer_name/supplier_name in sales/purchase register
|
2013-07-12 17:50:34 +05:30 |
|
Nabin Hait
|
87bed52818
|
[minor] [fix] get_query for cost center
|
2013-07-12 16:55:03 +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 |
|
Rushabh Mehta
|
1bfb6db586
|
[minor] Bill Date not mandatory in Purchase Invoice
|
2013-07-11 12:16:59 +05:30 |
|
Nabin Hait
|
d96bfaf6af
|
[fix] get_query where options not mentioned
|
2013-07-10 20:30:00 +05:30 |
|
Nabin Hait
|
eddd4a1674
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-10 19:12:14 +05:30 |
|
Nabin Hait
|
a4f0240bfc
|
[conflict] merged for get_query
|
2013-07-10 19:05:57 +05:30 |
|
Rushabh Mehta
|
ad71473f35
|
[cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix
|
2013-07-10 18:59:55 +05:30 |
|
Saurabh
|
ee85cfd476
|
get_query to server side
|
2013-07-10 17:35:14 +05:30 |
|
Saurabh
|
a29b69245e
|
get_query to servet side
|
2013-07-10 16:06:31 +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
|
86408c3d44
|
queries to server side
|
2013-07-10 14:00:37 +05:30 |
|
Saurabh
|
f52dc07a58
|
queries to server side
|
2013-07-10 13:07:49 +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
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +05:30 |
|
Nabin Hait
|
5c33e59e7a
|
[fix][report] sales/purchase register, same accounts as income and tax account
|
2013-07-09 15:38:40 +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
|
3b999225ba
|
[validation] over billing against DN/PR
|
2013-07-09 12:35:52 +05:30 |
|
Nabin Hait
|
e03e38db1e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-09 11:36:41 +05:30 |
|
Nabin Hait
|
253de859b4
|
[fixes] for testcases
|
2013-07-09 11:36:00 +05:30 |
|
Rushabh Mehta
|
8f050f4cd3
|
[sales invoice] payment section visible only if is_pos is true #382
|
2013-07-09 11:28:47 +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 |
|
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
|
7eee8531b2
|
[mapper-pull] for sales / purchae
|
2013-07-08 18:03:40 +05:30 |
|
Rushabh Mehta
|
d9e7070f2d
|
[mapper-pull] for sales / purchae
|
2013-07-08 18:01:46 +05:30 |
|
Rushabh Mehta
|
11eda08cd5
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-08 12:40:06 +05:30 |
|
Rushabh Mehta
|
436467a5c9
|
[purchase order] tests pass
|
2013-07-08 12:37:59 +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
|
1daad6b1ca
|
[report] added some extra columns
|
2013-07-08 11:28:59 +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 |
|
Rushabh Mehta
|
8f48db33d2
|
[sales invoice] added progress bar of payment
|
2013-07-05 16:54:40 +05:30 |
|
Rushabh Mehta
|
f7de376932
|
[sales invoice] added progress bar of payment
|
2013-07-05 16:50:43 +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
|
11d688a536
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 15:14:15 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Anand Doshi
|
ef8d3bcb77
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 12:57:41 +05:30 |
|
Anand Doshi
|
901773a139
|
[fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files
|
2013-07-05 12:57:03 +05:30 |
|
Rushabh Mehta
|
54352c7140
|
[form cleanup]
|
2013-07-05 12:43:59 +05:30 |
|
Rushabh Mehta
|
8005362c6c
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 10:51:51 +05:30 |
|
Rushabh Mehta
|
e953f0bb97
|
[form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt
|
2013-07-05 10:48:35 +05:30 |
|
Nabin Hait
|
44935e4608
|
[fixed conflict]
|
2013-07-05 10:26:29 +05:30 |
|
Anand Doshi
|
0b4943cec1
|
[webshop] shopping cart with shipping rule selector, totals
|
2013-07-04 23:45:22 +05:30 |
|
Anand Doshi
|
a749996747
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-04 18:30:44 +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 |
|
Nabin Hait
|
bc9cf1549f
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 17:56:51 +05:30 |
|
Nabin Hait
|
151b0bd153
|
[merge conflict]
|
2013-07-04 17:56:28 +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 |
|
Nabin Hait
|
9010f92eab
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 16:03:24 +05:30 |
|
Nabin Hait
|
19f2396f95
|
Update Purchase Receipt-Purchase Invoice.txt
|
2013-07-04 14:56:50 +05:30 |
|
Nabin Hait
|
7dc77f764f
|
Update Purchase Order-Purchase Invoice.txt
|
2013-07-04 14:56:29 +05:30 |
|
Nabin Hait
|
e2dd800999
|
Update purchase_register.py
|
2013-07-04 14:37:58 +05:30 |
|
Rushabh Mehta
|
bcff7dce8e
|
[cleanup] [stock entry] [sales order]
|
2013-07-03 18:32:29 +05:30 |
|
Nabin Hait
|
18f754d53c
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-03 13:31:15 +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 |
|
Nabin Hait
|
72abfa6b4b
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-03 11:48:10 +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 |
|