Rushabh Mehta
|
e6d986adea
|
[import] fixes
|
2013-06-27 10:54:49 +05:30 |
|
Rushabh Mehta
|
dd548eeac3
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-27 09:50:04 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Akhilesh Darjee
|
89bd216a0c
|
[Fix] SMS Center
|
2013-06-26 18:28:54 +05:30 |
|
Anand Doshi
|
f7c4d1e807
|
[setup home] moved SMS Settings link to Tools section
|
2013-06-26 17:33:59 +05:30 |
|
Rushabh Mehta
|
5381bdd730
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-26 17:21:03 +05:30 |
|
Rushabh Mehta
|
2f7e1abd0f
|
[setup] new page + minor fixes
|
2013-06-26 17:20:12 +05:30 |
|
Anand Doshi
|
922bb1af46
|
[shipping rule] validations and test cases
|
2013-06-26 17:14:40 +05:30 |
|
Nabin Hait
|
1a8054994e
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-06-26 14:30:03 +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 |
|
Anand Doshi
|
510a45bfb4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-06-26 12:06:34 +05:30 |
|
Anand Doshi
|
b802050cd4
|
[grid report] round currency values
|
2013-06-26 12:05:37 +05:30 |
|
Nabin Hait
|
329a3df260
|
Merge pull request #530 from akhileshdarjee/master
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-25 23:29:24 -07:00 |
|
Nabin Hait
|
645d3441ef
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-06-26 11:33:25 +05:30 |
|
Akhilesh Darjee
|
4c819edf24
|
[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register
|
2013-06-26 11:28:53 +05:30 |
|
Rushabh Mehta
|
f49f82083f
|
[chart of accounts] added from openerp (remove empty children)
|
2013-06-26 10:10:05 +05:30 |
|
Rushabh Mehta
|
db038fcb5c
|
[chart of accounts] added from openerp
|
2013-06-26 02:14:40 +05:30 |
|
Nabin Hait
|
568910ef7a
|
Merge pull request #529 from akhileshdarjee/master
[Fix]SMS Center Cell Number
|
2013-06-25 05:33:21 -07:00 |
|
Akhilesh Darjee
|
611dd9808c
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-06-25 18:01:05 +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 |
|
Nabin Hait
|
df6ad717b2
|
Merge pull request #517 from akhileshdarjee/master
[Report] Cleanup of Territory Target Variance, Sales Person Target Variance, Budget Variance Report & Item Prices
|
2013-06-25 02:53:58 -07:00 |
|
Nabin Hait
|
50899d2bd4
|
[fix][patch] bom exploded items
|
2013-06-25 15:17:38 +05:30 |
|
Nabin Hait
|
cca41a172c
|
[fix][report] general ledger
|
2013-06-25 14:14:32 +05:30 |
|
Nabin Hait
|
909e8b120f
|
[fix][report] general ledger
|
2013-06-25 14:08:18 +05:30 |
|
Rushabh Mehta
|
a94d1af871
|
[install] fixes - do not update parent doctype if in_import
|
2013-06-25 12:36:13 +05:30 |
|
Nabin Hait
|
ec1f69ddb9
|
[reports][fix] removed old reports
|
2013-06-25 12:17:43 +05:30 |
|
Rushabh Mehta
|
9132de5e4c
|
[global defaults] breakup added buying settings and selling settings
|
2013-06-25 11:54:37 +05:30 |
|
Rushabh Mehta
|
664ba4001f
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-25 11:46:24 +05:30 |
|
Rushabh Mehta
|
d242a8babd
|
[patch] breakup global defaults
|
2013-06-25 11:46:07 +05:30 |
|
Nabin Hait
|
3c6361e438
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-06-25 11:43:31 +05:30 |
|
Akhilesh Darjee
|
78e622ef5c
|
Deleted search criteria
|
2013-06-25 11:08:19 +05:30 |
|
Nabin Hait
|
4d150e67e6
|
[patch] reload sales partner for webpage
|
2013-06-25 11:05:17 +05:30 |
|
Nabin Hait
|
13f2e4d8d7
|
[fix][transaction.js] syntax error
|
2013-06-25 10:56:39 +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 |
|
Nabin Hait
|
3e8eca35a2
|
[report][fix] stock balance
|
2013-06-24 17:18:24 +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 |
|
Saurabh
|
85cbe16f52
|
[patch] reload sales partner for webpage
|
2013-06-24 15:16:50 +05:30 |
|
Rushabh Mehta
|
7fba9b31d9
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-06-24 15:00:25 +05:30 |
|
Saurabh
|
7b4bbbd6bd
|
[reload doctype and page]
|
2013-06-24 15:00:21 +05:30 |
|
Rushabh Mehta
|
7b69f5b425
|
[docs] upgraded font-awesome and added some icons
|
2013-06-24 14:59:44 +05:30 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Saurabh
|
7bfb2b6814
|
Merge branch 'responsive' of https://github.com/webnotes/erpnext into responsive
|
2013-06-24 14:10:36 +05:30 |
|
Nabin Hait
|
8b96ba1da6
|
[general ledger] group by voucher
|
2013-06-24 13:54:16 +05:30 |
|
Nabin Hait
|
a292b44df3
|
[fixes] pull previous doc details
|
2013-06-24 12:24:01 +05:30 |
|