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 |
|
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
|
436467a5c9
|
[purchase order] tests pass
|
2013-07-08 12:37: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
|
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
|
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
|
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 |
|
Nabin Hait
|
71c3f95098
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 18:28:26 +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
|
36af6a02ad
|
[grid reports] now show by wn.route_options
|
2013-07-01 14:35:57 +05:30 |
|
Rushabh Mehta
|
e0117896d4
|
[print] fix wnframework #192, fix in journal voucher
|
2013-07-01 12:59:22 +05:30 |
|
Nabin Hait
|
fdbfe1c274
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 12:20:19 +05:30 |
|
Nabin Hait
|
b5e58ffa26
|
[rename with merge] updated on_rename function for item, warehouse, al tree type documents
|
2013-07-01 12:20:00 +05:30 |
|
Rushabh Mehta
|
b3f947aca6
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-01 09:36:39 +05:30 |
|
Rushabh Mehta
|
8706ca9445
|
[journal voucher] [added opening entry] [cleanups]
|
2013-07-01 09:36:03 +05:30 |
|
Nabin Hait
|
d122bf51cb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-27 12:22:12 +05:30 |
|
Nabin Hait
|
c35dd968af
|
[fix] invoice with zero values
|
2013-06-27 12:21:34 +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
|
16c06dc713
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-27 11:02:22 +05:30 |
|
Nabin Hait
|
4924a9f764
|
[fix] payment reconciliation tool
|
2013-06-27 11:01:14 +05:30 |
|
Akhilesh Darjee
|
89bd216a0c
|
[Fix] SMS Center
|
2013-06-26 18:28:54 +05:30 |
|
Anand Doshi
|
922bb1af46
|
[shipping rule] validations and test cases
|
2013-06-26 17:14:40 +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 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +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 |
|
Rushabh Mehta
|
847cfe2b07
|
[docs] [setup] cleanup
|
2013-06-24 15:43:18 +05:30 |
|
Nabin Hait
|
4cd977a2a9
|
[fixes] pull previous doc details
|
2013-06-24 12:20:35 +05:30 |
|