Nabin Hait
|
fa9fabaa49
|
Serial no status fix: patch to set status not available where no sle exists
|
2014-01-27 12:46:18 +05:30 |
|
Akhilesh Darjee
|
49e8e783e3
|
webnotes/erpnext#1353 allow rename for price list
|
2014-01-27 11:12:24 +05:30 |
|
Rushabh Mehta
|
1230e3a28b
|
don't hide customer / supplier links, webnotes/erpenxt#796
|
2014-01-27 11:02:27 +05:30 |
|
Anand Doshi
|
c4ee74857d
|
BugFix: Production Planning Tool - get_raw_materials
|
2014-01-24 21:53:11 +05:30 |
|
Anand Doshi
|
3f8f4ff6cd
|
BugFix: Production Planning Tool - get_raw_materials
|
2014-01-24 21:47:01 +05:30 |
|
Anand Doshi
|
cb39e0878e
|
Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
config.json
erpnext/accounts/utils.py
erpnext/patches/patch_list.py
erpnext/stock/doctype/price_list/price_list.txt
erpnext/stock/doctype/warehouse/warehouse.py
portal/templates/sale.html
portal/utils.py
selling/doctype/sales_order/templates/pages/order.py
selling/utils/cart.py
selling/utils/product.py
utilities/demo/demo_docs/Fiscal_Year.csv
utilities/demo/make_demo.py
|
2014-01-24 21:44:36 +05:30 |
|
Akhilesh Darjee
|
a4e0a1c061
|
minor changes
|
2014-01-24 19:57:52 +05:30 |
|
Anand Doshi
|
fc13b87fd5
|
Fixes in Make Demo
|
2014-01-24 18:54:50 +05:30 |
|
Anand Doshi
|
d9ba544e09
|
Fix in Item Test Case
|
2014-01-24 15:59:05 +05:30 |
|
Rushabh Mehta
|
2fa914b410
|
Merge pull request #1347 from akhileshdarjee/4.0-hotfix
method name fixing
|
2014-01-24 02:07:22 -08:00 |
|
Rushabh Mehta
|
e288e5238a
|
added title_fields for Task, Newsletter
|
2014-01-24 15:33:42 +05:30 |
|
Akhilesh Darjee
|
7cbf5b4e67
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-01-24 11:12:50 +05:30 |
|
Akhilesh Darjee
|
44edfb7231
|
method name fixing
|
2014-01-24 11:10:46 +05:30 |
|
Rushabh Mehta
|
1cd96a136f
|
updates for restriction
|
2014-01-24 11:10:24 +05:30 |
|
Nabin Hait
|
af21479665
|
Merge pull request #1342 from akhileshdarjee/hotfix
Item List refresh when price list changed in POS
|
2014-01-23 05:14:16 -08:00 |
|
Nabin Hait
|
93eab5521c
|
Minor fix in path
|
2014-01-23 17:58:03 +05:30 |
|
Nabin Hait
|
4ba95d0b7a
|
Fix in testcases
|
2014-01-23 16:45:22 +05:30 |
|
Nabin Hait
|
5ae6a61c4d
|
Fixes related to appifing shopping cart
|
2014-01-23 15:33:30 +05:30 |
|
Nabin Hait
|
eec59ae7c4
|
Merge pull request #1345 from nabinhait/hotfix
Order preview through customer login
|
2014-01-23 01:48:28 -08:00 |
|
Nabin Hait
|
efa9a7ed5b
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-23 13:25:39 +05:30 |
|
Nabin Hait
|
557abdebe0
|
order preview through customer login
|
2014-01-23 13:25:26 +05:30 |
|
Akhilesh Darjee
|
8589b1db22
|
Use model set_value for updating values from POS
|
2014-01-22 19:25:51 +05:30 |
|
Akhilesh Darjee
|
82a21beba0
|
Item List refresh when price list changed in POS
|
2014-01-22 16:55:32 +05:30 |
|
Pratik Vyas
|
256c4da0a5
|
Merge branch 'develop'
|
2014-01-22 16:03:07 +05:30 |
|
Pratik Vyas
|
7395dc9969
|
bumped to version 3.6.6
|
2014-01-22 16:33:07 +06:00 |
|
Nabin Hait
|
6a23cfa5cd
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0.0-wip
|
2014-01-22 15:57:32 +05:30 |
|
Nabin Hait
|
d39bc09e62
|
Merge pull request #1341 from nabinhait/hotfix
Small fix
|
2014-01-22 02:21:17 -08:00 |
|
Nabin Hait
|
c7676797e1
|
Dont display old fraction outstanding in AR report
|
2014-01-22 15:36:44 +05:30 |
|
Rushabh Mehta
|
7460dcf406
|
updated Bootstrap
|
2014-01-22 12:44:46 +05:30 |
|
Nabin Hait
|
423932fab2
|
Fixes in general ledger opening
|
2014-01-22 11:53:44 +05:30 |
|
Nabin Hait
|
efda5b0d36
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-21 20:58:10 +05:30 |
|
Nabin Hait
|
13a9e27320
|
Fixes in warehouse merge function
|
2014-01-21 20:57:39 +05:30 |
|
Pratik Vyas
|
b0433d96a3
|
Merge branch 'develop'
|
2014-01-21 12:09:31 +05:30 |
|
Pratik Vyas
|
f3aba2e536
|
bumped to version 3.6.5
|
2014-01-21 12:39:31 +06:00 |
|
Nabin Hait
|
1594f102fd
|
Merge pull request #1340 from nabinhait/hotfix
General ledger
|
2014-01-20 22:29:33 -08:00 |
|
Nabin Hait
|
b2f2df4c64
|
General ledger: opening balance issue fixed
|
2014-01-21 11:58:17 +05:30 |
|
Nabin Hait
|
9f6c48d82e
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-21 10:44:16 +05:30 |
|
Pratik Vyas
|
f0307dc75e
|
Merge branch 'develop'
|
2014-01-20 19:21:25 +05:30 |
|
Pratik Vyas
|
872e4d1f3d
|
bumped to version 3.6.4
|
2014-01-20 19:51:25 +06:00 |
|
Nabin Hait
|
b164e606f9
|
Merge pull request #1337 from nabinhait/hotfix
Hotfix
|
2014-01-20 05:00:43 -08:00 |
|
Nabin Hait
|
806343395a
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-20 18:29:48 +05:30 |
|
Nabin Hait
|
afe93d633c
|
Increased remarks width in general ledger
|
2014-01-20 18:28:48 +05:30 |
|
Nabin Hait
|
cd20717c3d
|
Merge pull request #1336 from akhileshdarjee/disable-price-list
Enabled feature for Price List
|
2014-01-20 04:47:10 -08:00 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
9e056ec1ce
|
Auto closing of tickets through schedulers
|
2014-01-20 17:46:37 +05:30 |
|
Rushabh Mehta
|
cef681942f
|
merge fix
|
2014-01-20 17:41:13 +05:30 |
|
Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
719f2803b3
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:01:28 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
529709e08b
|
patch for enabling all price list
|
2014-01-20 16:39:03 +05:30 |
|