Nabin Hait
|
e587bc3024
|
Update accounts_payable.py
|
2013-11-11 18:42:22 +05:30 |
|
Anand Doshi
|
c89b49c322
|
Merge remote-tracking branch 'origin/1310'
|
2013-11-11 13:45:19 +05:30 |
|
Akhilesh Darjee
|
7344353ac5
|
[report] [fix] accounts payable fixed for get_ageing_date()
|
2013-11-11 12:47:49 +05:30 |
|
Anand Doshi
|
0516fc6161
|
Merge branches '1310' and 'master' of github.com:webnotes/erpnext
|
2013-11-07 21:10:38 +05:30 |
|
Anand Doshi
|
ce7ed98e31
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 21:09:44 +05:30 |
|
Anand Doshi
|
aacbe7a277
|
Merge branches '1310' and 'master' of github.com:webnotes/erpnext
|
2013-11-07 21:04:36 +05:30 |
|
Anand Doshi
|
3990104e9b
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 21:04:01 +05:30 |
|
Anand Doshi
|
ed1679a1c5
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-07 20:49:13 +05:30 |
|
Anand Doshi
|
9ff22fd508
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 20:44:30 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +05:30 |
|
Nabin Hait
|
4144b1c841
|
[fix] [minor] itemwise sales/purchase register
|
2013-11-01 18:08:55 +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
|
5566bcaa0e
|
[cleanup] purchase common
|
2013-10-18 17:01:56 +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
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
6ec7d9d3f9
|
[fix] [minor] item-wose tax in item-wise sales register
|
2013-10-09 11:46:50 +05:30 |
|
Bárbara Perretti
|
48dbeb63b8
|
Fix translate sales_register.js
|
2013-09-30 18:21:02 -03:00 |
|
Bárbara Perretti
|
35fe5faba5
|
Fix translate purchase_register.js
|
2013-09-30 18:19:58 -03:00 |
|
Bárbara Perretti
|
2fec756fde
|
Fix translate payment_made_with_ageing.js
|
2013-09-30 18:19:03 -03:00 |
|
Bárbara Perretti
|
e696cd0b6c
|
Fix translate payment_collection_with_ageing.js
|
2013-09-30 18:17:35 -03:00 |
|
Bárbara Perretti
|
aa83cd0394
|
Fix translate item_wise_sales_register.js
|
2013-09-30 18:14:43 -03:00 |
|
Bárbara Perretti
|
40c98fb795
|
Fix translate item_wise_purchase_register.js
|
2013-09-30 18:13:24 -03:00 |
|
Bárbara Perretti
|
c685da0061
|
Fix translate gross_profit.js
|
2013-09-30 18:11:48 -03:00 |
|
Bárbara Perretti
|
2d3041e8ae
|
Fix translate budget_variance_report.js
|
2013-09-30 18:10:04 -03:00 |
|
Bárbara Perretti
|
2d393e36a5
|
Fix translate bank_reconciliation_statement.js
|
2013-09-30 18:08:50 -03:00 |
|
Bárbara Perretti
|
0a857b21d3
|
Fix translate bank_clearance_summary.js
|
2013-09-30 18:07:42 -03:00 |
|
Bárbara Perretti
|
4a7b199c4d
|
Fix translate accounts_receivable.js
|
2013-09-30 18:06:29 -03:00 |
|
Bárbara Perretti
|
8bb82aeac3
|
Fix translate accounts_payable.js
|
2013-09-30 17:57:17 -03:00 |
|
Nabin Hait
|
a3d12bde9d
|
[fix] [minor] gross profit report
|
2013-09-27 16:33:22 +05:30 |
|
Nabin Hait
|
625da79e9f
|
item-wise price list rate, editable report
|
2013-09-25 10:32:51 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Anand Doshi
|
ea55734df5
|
[fix] [minor] delivered items to be billed
|
2013-09-05 12:41:16 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Nabin Hait
|
94c90bdbf9
|
[fix] [minor] buying amount for sales bom item
|
2013-08-30 22:48:19 +05:30 |
|
Nabin Hait
|
9b09c95d83
|
[cleanup] [accounts] delete gl entries on cancellation of accounting transactions
|
2013-08-21 17:47:11 +05:30 |
|
Nabin Hait
|
d1055ce1bc
|
[fix] [minor] Target variance report if distribution id is not specified
|
2013-08-12 15:15:19 +05:30 |
|
Anand Doshi
|
5dd6b1d082
|
[optimization] [minor] pass filtered stock ledger entries to get_buying_amount
|
2013-08-07 19:27:30 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
6affb78e1f
|
[minor] moved delivered items to be billed to accounts module
|
2013-08-02 12:50:40 +05:30 |
|
Anand Doshi
|
e5c69133a8
|
[minor] moved delivered items to be billed to accounts module
|
2013-08-02 12:45:00 +05:30 |
|
Nabin Hait
|
dbe4d1930b
|
[minor] added customer/supplier id and name in sales/purchase register
|
2013-08-02 11:20:02 +05:30 |
|
Anand Doshi
|
f006916518
|
[fix] [minor] [report]
|
2013-07-31 11:47:54 +05:30 |
|
Anand Doshi
|
5c76f014a7
|
[report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed
|
2013-07-30 18:42:16 +05:30 |
|
Nabin Hait
|
114bc09164
|
[minor] [fix] same account in item and tax table
|
2013-07-26 15:47:47 +05:30 |
|
Nabin Hait
|
a10ef4592b
|
[minor] total tax column in item-wise sales/purchase register
|
2013-07-26 15:45:38 +05:30 |
|
Anand Doshi
|
508bd4c7d5
|
[report] Item-wise Purchase Register [issue] webnotes/erpnext#374
|
2013-07-26 13:09:40 +05:30 |
|
Anand Doshi
|
ac90542414
|
[report] Item-wise Sales Register [issue] webnotes/erpnext#372
|
2013-07-26 13:09:23 +05:30 |
|
Anand Doshi
|
5491332772
|
[fix] [minor] use wn.defaults.get_default instead of sys_defaults
|
2013-07-26 13:02:18 +05:30 |
|
Anand Doshi
|
6c7f3db755
|
[report] [issue] #641 - added customer name and supplier name in accounts receivable and accounts payable reports respectively
|
2013-07-24 16:49:11 +05:30 |
|
Nabin Hait
|
5b43b3dca5
|
merged with slow branch
|
2013-07-18 12:28:09 +05:30 |
|