Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,570 Commits 3 Branches 0 Tags 1 GiB
297041ed3e
Commit Graph

122 Commits

Author SHA1 Message Date
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
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
Nabin Hait
6f61e2c426 [fix] [minor] net_total on sales/purchase register 2013-07-16 18:47:06 +05:30
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
cbc96d5d14 [fix] [report] accounts receivable/payable 2013-07-16 13:13:38 +05:30
Nabin Hait
642634f6c8 [fix] [report] sales/purchase register: if income/expense account entered in tax table for discount 2013-07-16 12:11:00 +05:30
Nabin Hait
8faa90fb20 [fix] [minor] add customer_name/supplier_name in sales/purchase register 2013-07-12 17:50:34 +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
5c33e59e7a [fix][report] sales/purchase register, same accounts as income and tax account 2013-07-09 15:38:40 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +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
1daad6b1ca [report] added some extra columns 2013-07-08 11:28:59 +05:30
Nabin Hait
151b0bd153 [merge conflict] 2013-07-04 17:56:28 +05:30
Nabin Hait
e2dd800999 Update purchase_register.py 2013-07-04 14:37:58 +05:30