Nabin Hait
|
d43c6bfdfb
|
[fix] [merge conflict]
|
2013-10-24 11:57:02 +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
|
213da21332
|
[fix] [minor] naming for amendment
|
2013-10-21 18:32:56 +05:30 |
|
Nabin Hait
|
5566bcaa0e
|
[cleanup] purchase common
|
2013-10-18 17:01:56 +05:30 |
|
Akhilesh Darjee
|
2d82f26976
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-18 15:28:15 +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 |
|
Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
8f72d9f679
|
Merge pull request #974 from akhileshdarjee/master
[fix] [minor] conversion rate related fixes
|
2013-10-17 00:56:00 -07:00 |
|
Akhilesh Darjee
|
acf65a7225
|
[fix] [minor] conversion rate related fixes
|
2013-10-17 13:04:26 +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 |
|
Nabin Hait
|
185991d547
|
[fix] [minor] rounding error in purchase invoice gl entry
|
2013-10-16 13:08:53 +05:30 |
|
Nabin Hait
|
a012ffedd1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-16 11:48:39 +05:30 |
|
Nabin Hait
|
fc75d96abd
|
[fix] [minor] Purchase Invoice - Amount for Stock received but not billed
|
2013-10-16 11:48:15 +05:30 |
|
Nabin Hait
|
f146e8b7f5
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-16 11:19:09 +05:30 |
|
Akhilesh Darjee
|
61b5c59e70
|
[fix] fixed conversion rate for mapping any documents
|
2013-10-15 20:24:34 +05:30 |
|
Anand Doshi
|
a295bf5421
|
[minor] don't rollback when running all tests, fixed test cases
|
2013-10-15 19:52:29 +05:30 |
|
Nabin Hait
|
b6f37b8195
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 16:55:54 +05:30 |
|
Nabin Hait
|
b338b6ed24
|
[fix] [minor] validate converion rate
|
2013-10-15 16:55:24 +05:30 |
|
Akhilesh Darjee
|
8f90e1c8f4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 16:26:38 +05:30 |
|
Akhilesh Darjee
|
dd6ebc1a4d
|
[cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting
|
2013-10-15 15:54:31 +05:30 |
|
Akhilesh Darjee
|
1dfcc7557a
|
[fix] fetch difference account and cost center on selecting item in stock entry
|
2013-10-15 13:54:39 +05:30 |
|
Nabin Hait
|
1c62cbe1fc
|
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
|
2013-10-15 12:53:46 +05:30 |
|
Nabin Hait
|
3ceba11208
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-10-15 12:19:47 +05:30 |
|
Nabin Hait
|
f8924bcf6f
|
[fix] [minor] update serial no in sle while creating auto serial no
|
2013-10-15 12:19:25 +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
|
028a5202f6
|
[minor] fixed conflict
|
2013-10-15 11:53:03 +05:30 |
|
Akhilesh Darjee
|
bfeae2da70
|
[cleanup] [minor] removed conversion rate from pos setting
|
2013-10-15 11:16:38 +05:30 |
|
Akhilesh Darjee
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Akhilesh Darjee
|
1797cfef63
|
[fix] removed validation of conversion rate equals 1 from all transaction
|
2013-10-11 13:34:10 +05:30 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
3235e787c4
|
[fix] [minor] Pick cost_center from tax table for expense included in valuation
|
2013-10-09 12:04:41 +05:30 |
|
Nabin Hait
|
77f37e6b7c
|
Update Serial No details through serial_no controller
|
2013-10-08 17:11:33 +05:30 |
|
Nabin Hait
|
0352f9b827
|
[fix] [minor] gl entry cancellation
|
2013-10-05 15:38:43 +05:30 |
|
Anand Doshi
|
d1809e30e9
|
[minor] [fix] due date in sales invoice
|
2013-10-03 18:58:11 +05:30 |
|
Rushabh Mehta
|
f1b6f67a98
|
[Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868
|
2013-10-03 12:22:52 +05:30 |
|
Anand Doshi
|
fa228e9c9b
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/purchase_invoice/purchase_invoice.py
accounts/doctype/sales_invoice/sales_invoice.txt
selling/doctype/lead/lead.txt
selling/doctype/opportunity/opportunity.txt
stock/doctype/warehouse/warehouse.py
|
2013-10-02 16:52:52 +05:30 |
|
Rushabh Mehta
|
24ca7e4e2e
|
Added Transactions for Import webnotes/erpnext#911
|
2013-10-02 14:25:36 +05:30 |
|
Nabin Hait
|
cf3011839f
|
[fix] [minor] bind onclick function based on docstatus in pos
|
2013-10-01 18:14:16 +05:30 |
|
Nabin Hait
|
a3e9d0a83d
|
Merge pull request #921 from akhileshdarjee/master
[fix] [minor] new grid to hide delete button on new row & added description
|
2013-09-30 22:30:15 -07:00 |
|
Bárbara Perretti
|
dda4e83469
|
Fix translate sales_taxes_and_charges_master.js
|
2013-09-30 15:43:01 -03:00 |
|
Bárbara Perretti
|
cc0ef52abd
|
Fix translate sales_invoice.js
|
2013-09-30 15:38:40 -03:00 |
|
Bárbara Perretti
|
1a920c7ce8
|
Fix translate purchase_taxes_and_charges_master.js
|
2013-09-30 15:35:08 -03:00 |
|
Bárbara Perretti
|
46d2b9a895
|
Fix translate purchase_invoice.js
|
2013-09-30 15:19:16 -03:00 |
|
Bárbara Perretti
|
568ce8653e
|
Fix translate payment_to_invoice_matching_tool.js
|
2013-09-30 15:13:24 -03:00 |
|
Bárbara Perretti
|
dc6cab63dc
|
Fix translate journal_voucher.js
|
2013-09-30 15:03:17 -03:00 |
|
Bárbara Perretti
|
676e081ed3
|
Fix translate Cost_center.js
|
2013-09-30 14:36:00 -03:00 |
|