Thura Hlaing
|
16f88ba3cd
|
import add_date, removed timedelta import
|
2014-01-27 20:22:08 +06:30 |
|
Thura Hlaing
|
e31a41854b
|
tabify modifications, minor coding style/message updates
|
2014-01-27 20:14:53 +06:30 |
|
Pratik Vyas
|
7349c191ab
|
Merge branch 'develop'
|
2014-01-27 17:49:50 +05:30 |
|
Pratik Vyas
|
dc540dda4d
|
bumped to version 3.7.1
|
2014-01-27 18:19:50 +06:00 |
|
Nabin Hait
|
4b97811941
|
Merge pull request #1359 from akhileshdarjee/4.0-hotfix
POS Invoice print format showing inclusive taxes and discount amount
|
2014-01-27 04:09:36 -08:00 |
|
Nabin Hait
|
5c494f79f3
|
Merge pull request #1360 from nabinhait/hotfix
Planned qty patch: auto commit on many writes
|
2014-01-27 04:07:43 -08:00 |
|
Nabin Hait
|
191935bbf5
|
Planned qty patch: auto commit on many writes
|
2014-01-27 17:37:06 +05:30 |
|
Akhilesh Darjee
|
ffa4769b51
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-01-27 17:32:32 +05:30 |
|
Akhilesh Darjee
|
db4304914c
|
POS Invoice print format showing inclusive taxes and discount amount
|
2014-01-27 17:27:39 +05:30 |
|
Nabin Hait
|
db7901ec49
|
Merge pull request #1261 from akhileshdarjee/maintenance2
Fixed Maintenance Schedule
|
2014-01-27 03:57:15 -08:00 |
|
Pratik Vyas
|
8c78a1abb7
|
Merge branch 'develop'
|
2014-01-27 17:19:45 +05:30 |
|
Pratik Vyas
|
8821541f33
|
bumped to version 3.7.0
|
2014-01-27 17:49:45 +06:00 |
|
Nabin Hait
|
5cec7ec84a
|
Merge pull request #1355 from akhileshdarjee/hotfix
Allow rename for price list
|
2014-01-27 02:40:08 -08:00 |
|
Thura Hlaing
|
9d5566634c
|
changed stock_frozen_upto to stock_frozen_upto_days, and added validation for it in stock ledger
|
2014-01-27 16:54:38 +06:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Nabin Hait
|
9536f112b5
|
Merge pull request #1358 from nabinhait/hotfix
Serial no and planned qty
|
2014-01-27 01:33:56 -08:00 |
|
Nabin Hait
|
44a40b860e
|
Fixed planned qty bug and patch to recalculate planned qty
|
2014-01-27 15:02:30 +05:30 |
|
Nabin Hait
|
b3d26c08f6
|
Fixed planned qty bug and patch to recalculate planned qty
|
2014-01-27 14:58:55 +05:30 |
|
Thura Hlaing
|
98d4622ed8
|
Merge branch 'develop' of github.com:trhura/erpnext
|
2014-01-27 14:10:52 +06:30 |
|
Thura Hlaing
|
24b26db327
|
initial prototype implementation for issue #856
|
2014-01-27 14:08:55 +06:30 |
|
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 |
|