Anand Doshi
|
f5794f1c07
|
Module Home Pages using Module View
|
2014-03-03 15:06:34 +05:30 |
|
Nabin Hait
|
311079a311
|
Patch: copy customer discount to pricing rule
|
2014-02-28 13:04:19 +05:30 |
|
Rushabh Mehta
|
063141d152
|
added patch for address
|
2014-02-28 11:37:36 +05:30 |
|
Anand Doshi
|
e9baaa68e7
|
Changed frappe.conn to frappe.db
|
2014-02-26 12:35:33 +05:30 |
|
Rushabh Mehta
|
a6628eee56
|
rename sitemap to route
|
2014-02-25 11:08:37 +05:30 |
|
Pratik Vyas
|
31affc0e67
|
bump modified dates for purchase receipt and purchase invoice
|
2014-02-17 11:36:10 +05:30 |
|
Rushabh Mehta
|
793ba6bd37
|
-webnotes +frappe 💥
|
2014-02-14 15:47:51 +05:30 |
|
Nabin Hait
|
36028bfb56
|
minor
|
2014-02-12 19:09:28 +05:30 |
|
Nabin Hait
|
e219d61ed4
|
patch included in patches txt
|
2014-02-12 17:08:35 +05:30 |
|
Rushabh Mehta
|
22ababbec1
|
configs
|
2014-02-07 18:16:11 +05:30 |
|
Akhilesh Darjee
|
602fdc0000
|
patch reloading employee form
|
2014-02-03 19:32:59 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Akhilesh Darjee
|
4cdb79941b
|
map charge to taxes and charges in transactions
|
2014-01-30 13:56:57 +05:30 |
|
Akhilesh Darjee
|
b665d86292
|
patch to reload all sales and purchase doctypes and print formats
|
2014-01-29 17:40:34 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +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
|
57738a0ff3
|
flat discount replaced to discount amount
|
2014-01-03 18:15:07 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Rushabh Mehta
|
c4a0ed63ef
|
Moved demo to separate app, moved patches folder
|
2013-12-27 17:30:24 +05:30 |
|
Anand Doshi
|
e7fc25d6a8
|
Fixes after permissions merge
|
2013-12-27 10:49:28 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|