Rushabh Mehta
|
e62a85afcf
|
[patch] [minor] removed patch
|
2013-07-10 20:44:13 +05:30 |
|
Saurabh
|
86408c3d44
|
queries to server side
|
2013-07-10 14:00:37 +05:30 |
|
Anand Doshi
|
1357c0b2df
|
[cleanup] #402 changed fieldname company_name to company in Cost Center
|
2013-07-09 15:45:38 +05:30 |
|
Nabin Hait
|
fd33b2b718
|
[patch] copy customer_address to shipping_address in delivery note
|
2013-07-09 11:42:38 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Anand Doshi
|
111ae7d6cd
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
|
2013-07-08 11:57:40 +05:30 |
|
Anand Doshi
|
690c2f5ffe
|
[patch] [fix] delete report
|
2013-07-08 11:55:50 +05:30 |
|
Anand Doshi
|
0f21b324c9
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
patches/patch_list.py
|
2013-07-08 11:53:35 +05:30 |
|
Nabin Hait
|
70eda07bcf
|
[report] deleted duplicate report
|
2013-07-08 11:33:09 +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
|
ed23cca9d3
|
[mapper] removed old mapper from files and database
|
2013-07-07 19:11:52 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Nabin Hait
|
fa8d69c7ca
|
Update patch_list.py
|
2013-07-04 15:02:23 +05:30 |
|
Nabin Hait
|
bce622d723
|
Update patch_list.py
|
2013-07-04 14:40:21 +05:30 |
|
Nabin Hait
|
3f30e3132b
|
[mapper] reload
|
2013-07-04 14:36:16 +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
|
ac24d0fa98
|
[fixes] ignore single doctypes in chekcing linked documents
|
2013-07-01 14:03:08 +05:30 |
|
Anand Doshi
|
8f9f8a43c7
|
[lead] [address] store lead address in Address doctype, with link field=lead
|
2013-06-28 19:18:33 +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
|
7925bd7079
|
[merge]
|
2013-06-24 15:47:02 +05:30 |
|
Saurabh
|
85cbe16f52
|
[patch] reload sales partner for webpage
|
2013-06-24 15:16:50 +05:30 |
|
Saurabh
|
7b4bbbd6bd
|
[reload doctype and page]
|
2013-06-24 15:00:21 +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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
149b461e62
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
|
2013-05-24 19:28:36 +05:30 |
|
Rushabh Mehta
|
9c5f4fe165
|
[knowledge base] removed and added patch to move to notes
|
2013-05-24 16:33:10 +05:30 |
|
Nabin Hait
|
b56412c646
|
[fixes][aii] cancelled gl entry for delivery note and patch
|
2013-05-23 17:41:52 +05:30 |
|
Anand Doshi
|
4543884021
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
|
2013-05-23 15:22:47 +05:30 |
|
Nabin Hait
|
62d0629d61
|
[feature] reorder level checking through scheduler
|
2013-05-22 16:19:10 +05:30 |
|
Anand Doshi
|
5be11b44ac
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
controllers/buying_controller.py
|
2013-05-21 19:40:09 +05:30 |
|
Nabin Hait
|
cb99045764
|
[patch] update lead, contact in support ticket
|
2013-05-21 17:17:40 +05:30 |
|
Nabin Hait
|
9053cbc9f8
|
[fixes][patch] update valuation rate in purchase cycle and repost patch
|
2013-05-20 15:28:44 +05:30 |
|
Anand Doshi
|
48787e944e
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-17 15:10:57 +05:30 |
|
Nabin Hait
|
8f78bec5b8
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-17 12:49:36 +05:30 |
|
Nabin Hait
|
f826b93a75
|
[patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch
|
2013-05-17 12:19:50 +05:30 |
|
Anand Doshi
|
6e0e1c8fcc
|
[patches] [fix] fixed an old patch
|
2013-05-16 15:46:32 +05:30 |
|
Anand Doshi
|
101877276e
|
[patches] [fix] fixed an old patch
|
2013-05-16 15:45:06 +05:30 |
|
Anand Doshi
|
71c265dee8
|
[patches] [fix] fix in old patch
|
2013-05-16 15:42:56 +05:30 |
|
Anand Doshi
|
1d4b5b4ca6
|
[patches] [fix] removed blog reload
|
2013-05-16 15:35:08 +05:30 |
|
Anand Doshi
|
0eef6e9e42
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/patch_list.py
|
2013-05-15 21:18:27 +05:30 |
|
Anand Doshi
|
21f4ea36b2
|
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
|
2013-05-10 18:08:32 +05:30 |
|
Nabin Hait
|
4e1dcfc561
|
[patch] repost stock for no posting date
|
2013-05-10 15:17:20 +05:30 |
|
Anand Doshi
|
3f9366bb6c
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-06 12:07:30 +05:30 |
|
Anand Doshi
|
0382d5a01d
|
[patch] [fix] reload print format doctype
|
2013-05-02 16:42:26 +05:30 |
|
Anand Doshi
|
8323b6da45
|
[patch] [fix] reload print format doctype
|
2013-05-02 16:41:20 +05:30 |
|
Anand Doshi
|
447008b045
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-01 14:48:16 +05:30 |
|
Anand Doshi
|
d7ad13a8a7
|
[price list] [country] specify country for a price list
|
2013-04-29 19:38:34 +05:30 |
|
Anand Doshi
|
bbc6cfac25
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
|
2013-04-29 15:23:30 +05:30 |
|
Anand Doshi
|
eda17eb20a
|
[patch] [fiel data] new patch p07_update_file_data_2
|
2013-04-29 15:21:30 +05:30 |
|
Nabin Hait
|
7b596d8d88
|
fixed conflict
|
2013-04-29 14:37:38 +05:30 |
|
Nabin Hait
|
345c8fbfa2
|
[patch] rebuild sales browser
|
2013-04-29 14:35:11 +05:30 |
|
Anand Doshi
|
e5a36a287f
|
[patch] [file data] patch for custom fields with name file_list
|
2013-04-29 14:12:27 +05:30 |
|
Rushabh Mehta
|
cdc9e2cd6f
|
[patch] [file data] reset permissions
|
2013-04-25 11:06:17 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Anand Doshi
|
c54bbc039f
|
[patch] [fix] reload Delivery Note Item before default cost center patch
|
2013-04-19 16:41:57 +05:30 |
|
Anand Doshi
|
aeef7bd910
|
[sales taxes and charges] renamed field cost_center_other_charges to cost_center
|
2013-04-19 16:21:55 +05:30 |
|
Anand Doshi
|
90dad5c5b5
|
Merge branch 'master' into edge
|
2013-04-19 11:43:16 +05:30 |
|
Anand Doshi
|
4d705590b7
|
[patch] [default cost center] defaults starting with colon like :Company should not be a part of database default spec
|
2013-04-18 16:21:42 +05:30 |
|
Nabin Hait
|
9a2dff6675
|
packing slip refactored
|
2013-04-17 17:21:31 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Nabin Hait
|
8f148249ac
|
reload doctype mapper patch
|
2013-04-16 12:36:59 +05:30 |
|
Anand Doshi
|
93b638af4d
|
Merge branch 'master' into edge
Conflicts:
patches/patch_list.py
|
2013-04-10 19:47:46 +05:30 |
|
Anand Doshi
|
e33f827e32
|
[modules] [fix] patch for storing only hidden modules
|
2013-04-10 19:33:57 +05:30 |
|
Rushabh Mehta
|
0c1611219e
|
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
|
2013-04-10 13:54:13 +05:30 |
|
Nabin Hait
|
1175227c08
|
[fixes] commented a patch as it is not needed
|
2013-04-10 11:48:27 +05:30 |
|
Nabin Hait
|
5639035268
|
[patch] create chart of accounts if not created
|
2013-04-09 14:56:30 +05:30 |
|
Nabin Hait
|
ead385e8a4
|
[patch] create chart of accounts if not created
|
2013-04-09 14:48:31 +05:30 |
|
Nabin Hait
|
29f3ecd6b1
|
[patch] create chart of accounts if not created
|
2013-04-09 14:46:12 +05:30 |
|
Nabin Hait
|
832320dc15
|
fixed conflict
|
2013-04-09 11:43:03 +05:30 |
|
Nabin Hait
|
fda2ab1054
|
fixed conflict
|
2013-04-09 11:41:20 +05:30 |
|
Nabin Hait
|
d35293de17
|
updated all role in some pages
|
2013-04-09 11:39:16 +05:30 |
|
Nabin Hait
|
fdea83ef42
|
fixed conflict
|
2013-04-08 13:08:19 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Anand Doshi
|
30bd65a81b
|
[patches] [fix] reload docperm
|
2013-04-07 10:19:18 +05:30 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Rushabh Mehta
|
cc86ec8642
|
merge
|
2013-04-03 16:38:20 +05:30 |
|
Nabin Hait
|
5c1d3c5a8b
|
[New Script Report] added report daily time log summary
|
2013-04-03 15:44:19 +05:30 |
|
Rushabh Mehta
|
27c4079ff9
|
[framework] [cleanup] desktop, todo, messages, modules setup moved to framework
|
2013-04-03 15:21:44 +05:30 |
|
Rushabh Mehta
|
5bbe063222
|
Merge branch 'master' into edge
|
2013-04-03 10:42:12 +05:30 |
|
Rushabh Mehta
|
c5ddb85d39
|
[patch] [fix] added reload print format
|
2013-04-03 10:06:54 +05:30 |
|
Rushabh Mehta
|
c0ad4a2229
|
[patch] [fix] added reload print format
|
2013-04-03 09:58:04 +05:30 |
|
Nabin Hait
|
1e3fc88940
|
[quotation][improvement] when made from lead
|
2013-04-02 18:13:20 +05:30 |
|