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 |
|
Nabin Hait
|
50899d2bd4
|
[fix][patch] bom exploded items
|
2013-06-25 15:17:38 +05:30 |
|
Nabin Hait
|
ec1f69ddb9
|
[reports][fix] removed old reports
|
2013-06-25 12:17:43 +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
|
4d150e67e6
|
[patch] reload sales partner for webpage
|
2013-06-25 11:05:17 +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 |
|
Nabin Hait
|
82366d3bb8
|
[report] deleted old reports based on search_criteria
|
2013-06-24 14:31:56 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +05:30 |
|
Nabin Hait
|
f78d16cca1
|
[general ledger] group by voucher option
|
2013-06-21 15:13:49 +05:30 |
|
Anand Doshi
|
b5fd788131
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-17 12:55:05 +05:30 |
|
Anand Doshi
|
11d311376e
|
[event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue
|
2013-06-17 12:51:36 +05:30 |
|
Anand Doshi
|
a2e2d4bd19
|
[price list] [fix] fix in buying selling price list patch
|
2013-06-12 17:44:10 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Rushabh Mehta
|
a642d59cfd
|
[patch] [cleanup] drop unused tables
|
2013-06-11 17:32:48 +05:30 |
|
Rushabh Mehta
|
1894709aa3
|
[patch] [cleanup] remove unused doctypes
|
2013-06-11 17:08:16 +05:30 |
|
Anand Doshi
|
27e6f13b5d
|
[cleanup] deprecated search criteria, amendment_date, cancel_reason
|
2013-06-11 16:23:18 +05:30 |
|
Rushabh Mehta
|
a40c60ea3e
|
[cleanup] removed Trash Control, SMS Receiver, Profile Control, GL Mapper, GL Mapper Detail
|
2013-06-11 10:43:00 +05:30 |
|
Anand Doshi
|
097ac352d6
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:38:31 +05:30 |
|
Anand Doshi
|
670199b9c6
|
[patch] [fix] event for project, oppty, lead
|
2013-06-10 15:38:01 +05:30 |
|
Anand Doshi
|
83ce95932a
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
|
2013-06-10 15:28:40 +05:30 |
|
Anand Doshi
|
dec9a165ac
|
[patch] [fix] events for project, lead, oppty
|
2013-06-10 15:26:54 +05:30 |
|
Anand Doshi
|
7e2010a649
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
projects/doctype/project/project.py
utilities/transaction_base.py
|
2013-06-10 15:25:07 +05:30 |
|
Anand Doshi
|
e53a81dcea
|
[event] [lead, opportunity, project] [fix] create events
|
2013-06-10 15:15:40 +05:30 |
|
Anand Doshi
|
6e6fb42906
|
[projects] [patch] fixed project completed patch
|
2013-06-07 15:55:31 +05:30 |
|
Rushabh Mehta
|
224ad17b1d
|
[profile] removed themes
|
2013-06-07 15:09:45 +05:30 |
|
Rushabh Mehta
|
cdd265d3bf
|
[project] added patch
|
2013-06-07 14:52:53 +05:30 |
|
Anand Doshi
|
e3e15a94c3
|
[system console] [security fix] removed system console
|
2013-06-06 11:35:49 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
90202aec2b
|
[merge conflict]
|
2013-06-05 12:37:10 +05:30 |
|
Nabin Hait
|
aec5553814
|
bom exploded items grouped by items
|
2013-06-04 17:20:47 +05:30 |
|
Nabin Hait
|
8d7310ac5f
|
bom exploded items grouped by items
|
2013-06-04 17:11:43 +05:30 |
|
Nabin Hait
|
89ab4719ff
|
bom exploded items grouped by items
|
2013-06-04 17:07:57 +05:30 |
|
Nabin Hait
|
ad600cce22
|
bom exploded items grouped by items
|
2013-06-04 16:56:56 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
Anand Doshi
|
c7b8c4a414
|
[move update stock to pos] set update_stock = 0 in old sales invoice where is_pos = 0
|
2013-05-31 16:31:44 +05:30 |
|
Anand Doshi
|
74a62b17f4
|
[update file data 2 patch] [fix] auto commit on many writes for the duration of the patch
|
2013-05-30 23:49:00 +05:30 |
|
Anand Doshi
|
b68fbf0532
|
[update file size patch] [fix] auto commit on many writes for the duration of the patch
|
2013-05-30 23:39:24 +05:30 |
|
Anand Doshi
|
f41ce11e91
|
[taxes and charges] [item wise tax detail] patch to store this as json
|
2013-05-30 19:18:51 +05:30 |
|
Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Rushabh Mehta
|
c6f890f892
|
[merge]
|
2013-05-29 13:19:27 +05:30 |
|
Anand Doshi
|
047442efa2
|
[notes] [fix] fix in note patch
|
2013-05-29 11:07:11 +05:30 |
|
Rushabh Mehta
|
f32ee3c28e
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-05-29 11:07:05 +05:30 |
|
Rushabh Mehta
|
67d1afa481
|
[grid] allow section breaks and relayout grid
|
2013-05-29 11:06:03 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Rushabh Mehta
|
6986fc7ff3
|
[comment] fix creation, deltion, close #131
|
2013-05-28 13:09:23 +05:30 |
|
Rushabh Mehta
|
74560b32c1
|
[website] updates for bootstrap3
|
2013-05-27 14:47:56 +05:30 |
|
Anand Doshi
|
5dfba486a6
|
[note] [fix] strip invalid characters from title and set it as the name of the note
|
2013-05-27 12:25:28 +05:30 |
|