Akhilesh Darjee
|
2678ed181a
|
[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order
|
2013-12-18 13:28:40 +05:30 |
|
Akhilesh Darjee
|
9ee20e8f5a
|
[fix] [minor] material request sales order wise through production planning tool
|
2013-12-17 13:07:00 +05:30 |
|
Akhilesh Darjee
|
9ff9dafd00
|
[feature] create material request sales order wise from production planning tool
|
2013-12-16 19:32:22 +05:30 |
|
Akhilesh Darjee
|
229b246d6d
|
[fix] [minor] production planning tool clear sales order table
|
2013-12-11 18:49:11 +05:30 |
|
Akhilesh Darjee
|
f0dad52aaa
|
[fix] [minor] merge conflict fix
|
2013-12-10 18:11:31 +05:30 |
|
Akhilesh Darjee
|
aebb9f422b
|
[fix] [minor] merge conflict fixes
|
2013-12-10 18:01:18 +05:30 |
|
Akhilesh Darjee
|
4e677a3f52
|
[fix] [minor] stashed bom.txt
|
2013-12-10 15:23:07 +05:30 |
|
Akhilesh Darjee
|
5d3da6c095
|
[fix] [minor] rename fix for customer and supplier
|
2013-12-10 11:18:08 +05:30 |
|
Akhilesh Darjee
|
5ce1b8b8f9
|
[fix] [minor] customer name visibility fixed in sales invoice
|
2013-12-09 16:29:04 +05:30 |
|
Akhilesh Darjee
|
d9255abd46
|
[fix] [minor] set send_print_in_body_and_attachment in email settings
|
2013-12-06 18:49:48 +05:30 |
|
Akhilesh Darjee
|
245200f129
|
[fix] [minor] bom operations fix
|
2013-12-04 11:54:13 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Rushabh Mehta
|
4f642e7670
|
[cleanup] Fixed title bars, toolbars in all pages, added default background
|
2013-11-13 16:58:18 +05:30 |
|
Anand Doshi
|
ca8019bd97
|
[minor] fixes after remark field removal
|
2013-11-11 14:06:05 +05:30 |
|
Rushabh Mehta
|
ef5845589d
|
[cleanup] [minor] finishing styles, labels, descriptions
|
2013-11-02 14:47:11 +05:30 |
|
Rushabh Mehta
|
bed14d7fa4
|
Merge branch 'master' of github.com:webnotes/erpnext into cleanup
|
2013-10-31 15:16:05 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
a5bd3dd207
|
[fix] [minor] update finished goods against production order
|
2013-10-28 19:59:43 +05:30 |
|
Rushabh Mehta
|
069672e197
|
[minor] cleanup start
|
2013-10-28 18:21:07 +05:30 |
|
Nabin Hait
|
ca8ad210d2
|
Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n
|
2013-10-24 11:40:32 +05:30 |
|
Nabin Hait
|
3eb901f47d
|
[merge] merged with master
|
2013-10-24 11:21:11 +05:30 |
|
Nabin Hait
|
5566bcaa0e
|
[cleanup] purchase common
|
2013-10-18 17:01:56 +05:30 |
|
Akhilesh Darjee
|
fcd70d04f3
|
[item price] item price made as an individual master and removed from price list
|
2013-10-18 14:24:21 +05:30 |
|
Nabin Hait
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Bárbara Perretti
|
4b41e5f7f7
|
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
|
2013-10-16 15:09:18 -03:00 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Nabin Hait
|
eea2b34f4b
|
[production] update planned and produced ty
|
2013-10-11 18:31:33 +05:30 |
|
Rushabh Mehta
|
56bc5c0ea6
|
[material request] Added feature to pull items from BOM
|
2013-10-11 14:34:46 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Rushabh Mehta
|
5d45557729
|
[wsgi] [minor] fixed flags
|
2013-10-08 18:23:05 +05:30 |
|
Nabin Hait
|
8f05c05bfb
|
Validate warehouse for allowed users and matched company
|
2013-10-07 13:08:13 +05:30 |
|
Bárbara Perretti
|
328f384cdc
|
Fix translate production_planning_tool.js
|
2013-10-04 15:11:58 -03:00 |
|
Bárbara Perretti
|
e582ac4eea
|
Fix translate production_order.js
|
2013-10-04 15:09:54 -03:00 |
|
Bárbara Perretti
|
e47cc0408c
|
Fix translate bom.js
|
2013-10-04 15:06:55 -03:00 |
|
Rushabh Mehta
|
24ca7e4e2e
|
Added Transactions for Import webnotes/erpnext#911
|
2013-10-02 14:25:36 +05:30 |
|
Anand Doshi
|
5b004ff8a7
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/account/account.py
accounts/doctype/gl_entry/gl_entry.py
accounts/doctype/period_closing_voucher/period_closing_voucher.py
stock/doctype/delivery_note/delivery_note.py
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/stock_ledger/stock_ledger.py
stock/doctype/warehouse/warehouse.py
stock/stock_ledger.py
|
2013-09-25 19:55:41 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Nabin Hait
|
f68d563a68
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:49:26 +05:30 |
|
Nabin Hait
|
7bd850a133
|
[patch] [minor] fix sle against cancelled stock entry for production
|
2013-08-20 17:40:26 +05:30 |
|
Rushabh Mehta
|
20a109452a
|
[buying] [manufacturing] Added new Reports and fixes for demo
|
2013-08-20 15:18:42 +05:30 |
|
Nabin Hait
|
74c281cc55
|
[cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction
|
2013-08-19 16:17:18 +05:30 |
|
Nabin Hait
|
de336dee9c
|
[fix] [minor] map use_multi_level_bom from production order to stoc entry
|
2013-08-14 11:22:35 +05:30 |
|
Rushabh Mehta
|
4c17f9420e
|
[manufacturing] Added New Reports
|
2013-08-12 14:18:09 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Rushabh Mehta
|
0b9954059c
|
[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)
|
2013-08-09 15:30:11 +05:30 |
|
Rushabh Mehta
|
75c3171c04
|
[rename] Naming Series is now Document Numbering Series and updated translations
|
2013-08-08 16:00:40 +05:30 |
|