Commit Graph

1114 Commits

Author SHA1 Message Date
Nabin Hait
6f0a3ed8d4 fixed conflict 2015-02-17 11:12:04 +05:30
Anand Doshi
c82331bc19 [design] Setup Wizard 2015-02-12 20:02:17 +05:30
Nabin Hait
5690be103c Replaced renamed total fields in code files 2015-02-12 16:09:11 +05:30
Nabin Hait
dd1c2d3018 Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc 2015-02-12 13:31:48 +05:30
Nabin Hait
4a149c0791 Chart of accounts cleanup for Nicaragua 2015-02-12 12:39:32 +05:30
Nabin Hait
461ee2ebae Renamed total fields 2015-02-12 11:47:45 +05:30
Nabin Hait
0c0749a884 Merge pull request #2721 from williamjmorenor/v5.0
Add chart of accounts template for Nicaragua
2015-02-12 11:46:43 +05:30
William Moreno
5b72e21186 Final Fixing
I will no make other changes, please can chech the JSON
2015-02-11 16:57:43 -06:00
William Moreno
a05e6df3f5 Minor Fix 2015-02-11 15:48:41 -06:00
William Moreno
dab1db9874 Minor Fix 2015-02-11 15:43:40 -06:00
William Moreno
8e5e414276 Minor fix 2015-02-11 15:38:27 -06:00
William Moreno
92774e4743 Minor fix 2015-02-11 15:36:14 -06:00
William Moreno
c2037c5444 Add root_type and account_type 2015-02-11 15:06:58 -06:00
William Moreno
0a582ec885 Validate JSON 2015-02-11 12:41:11 -06:00
William Moreno
df023bd8ad Best accounts tax details 2015-02-11 12:38:51 -06:00
William Moreno
f2bf17f2e2 Best IFRS for SMES compatibility 2015-02-11 12:06:40 -06:00
William Moreno
43d39f8e4d Best IFRS for SMES compatibility 2015-02-11 11:57:22 -06:00
William Moreno
6b34bca7d0 Best IFRS for SMES compatibility 2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979 Rearrange accounts to improve readability 2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d Change Style => TITLE to Title 2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae Fix missing Comma (,)
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Nabin Hait
7945712171 Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc 2015-02-11 12:55:10 +05:30
William Moreno
ad45007362 Add chart of accounts template for Nicaragua
On branch v5.0

	new file:   erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177 Fixed conflict while merging v4 into v5 2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Anand Doshi
dd942bb3d2 [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists 2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220 item-wise tax distribution if amount entered in actual 2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Nabin Hait
0c883500bb Expense account query in purchase invoice 2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960 [fix] analytics reports + remove print item tables #2667 2015-02-03 17:56:25 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
538253e503 removed test files for purchase taxes and charges master 2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb replaced budget distribution 2015-01-23 16:32:35 +05:30
Nabin Hait
b4a3dfa893 All the calculations in taxes_and_totals file 2015-01-22 17:13:13 +05:30
Nabin Hait
59de1e23bc POS fix: setting discount amount 2015-01-21 17:50:28 +05:30
Nabin Hait
963393409e minor fix: child table length 2015-01-21 17:22:11 +05:30
Nabin Hait
0a3e5653ba bank reconciliation fix 2015-01-21 16:40:47 +05:30
Rushabh Mehta
81e972eac4 [cleanups] 2015-01-19 17:34:54 +05:30
Anand Doshi
f02e142d5d [design] mobile 2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae [minor] auto-create Fiscal Year, loading, general ledger 2015-01-19 15:59:45 +05:30
Nabin Hait
cff8993478 Merge pull request #2572 from neilLasrado/credit-note
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905 Merge pull request #2553 from neilLasrado/mode-of-payment
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
84662f2db5 minor fix in payment receipt voucher print format 2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c Hide currency and price list section after submission 2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
bd2ac2f51f mode of payment - company wise default account added 2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
50763d58ce frappe.db.exist used 2015-01-14 11:54:55 +05:30