Commit Graph

10590 Commits

Author SHA1 Message Date
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
c3d79305f6 Merge pull request #1 from williamjmorenor/ni_ni_chart_of_account
ni_ni_chart_template.json 

* Fix missing Comma (,)
* Change Style => TITLE to Title
* Rearrange accounts to improve readability
* Best IFRS for SMES compatibility
* Best accounts tax details
* Validate JSON
* Add root_type and account_type
2015-02-11 15:11:37 -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
Neil Trini Lasrado
802d717a9e fixes 2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16 journal entry - accounts table cannot be blank - validation added 2015-02-11 17:05:41 +05:30
Nabin Hait
ceb04726c8 Merge pull request #2725 from neilLasrado/workstation-operation-hours
Workstation Doc Fixed
2015-02-11 16:52:26 +05:30
Nabin Hait
27a1f20135 Merge pull request #2724 from neilLasrado/planned-start-date
validations added to production order
2015-02-11 16:51:39 +05:30
Nabin Hait
ff23936584 Merge pull request #2728 from neilLasrado/patch-fixed
landed cost voucher fix
2015-02-11 16:51:02 +05:30
Neil Trini Lasrado
daaf5814fa landed cost voucher fix 2015-02-11 16:23:46 +05:30
Neil Trini Lasrado
8521558f40 Workstation Doc Fixed 2015-02-11 14:58:43 +05:30
Neil Trini Lasrado
87402df56a validations added to production order 2015-02-11 14:35:52 +05:30
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
Pratik Vyas
eac82039e3 Merge branch 'develop' 2015-02-09 18:34:23 +05:30
Pratik Vyas
e0a8f2d859 bumped to version 4.21.3 2015-02-09 19:04:23 +06:00
Nabin Hait
fcca772383 Merge pull request #2712 from nabinhait/fix1
UOM validation for BOM Items
2015-02-09 17:02:41 +05:30
Nabin Hait
c5fb88c1cd UOM validation for BOM Items 2015-02-09 16:48:02 +05:30
Pratik Vyas
aacb0a702e Add auto email id in test site_config.json 2015-02-06 16:55:41 +05:30
Pratik Vyas
f3a9d788bf Merge branch 'develop' 2015-02-06 16:32:00 +05:30
Pratik Vyas
6203cf7f04 bumped to version 4.21.2 2015-02-06 17:02:00 +06:00
Nabin Hait
2813f38c5a Merge pull request #2695 from neilLasrado/bom-item-desc
Update BOM Item Description
2015-02-06 16:20:05 +05:30
Neil Trini Lasrado
845be908d6 function moved to validate 2015-02-06 16:15:45 +05:30
Neil Trini Lasrado
8fd3828ef5 Update Item Desc Button Removed from BOM, Item desc automatically updated in BOM on save of item master 2015-02-06 16:09:55 +05:30
Nabin Hait
4e95d67477 Merge pull request #2679 from neilLasrado/time-log-fix
Time log fix
2015-02-06 16:09:36 +05:30
Neil Trini Lasrado
11cd4f6c30 time log activity type made mandatory, new activity type manufacturing created 2015-02-06 16:06:45 +05:30
Neil Trini Lasrado
07a0d250ed time log fixes 2015-02-06 16:06:14 +05:30
Neil Trini Lasrado
b744e16a83 Activity made compulsory for time_log_type Project 2015-02-06 16:05:34 +05:30
Neil Trini Lasrado
93638bd179 Time Log -
Project made compulsory for time logs with time_log_for selected as 'Project'
Activity Type Madetory criteria removed
Compleated Quantity hidden if time_log_for is not set as Manufacturing
2015-02-06 16:05:34 +05:30
Nabin Hait
e7cf961eaa Merge pull request #2690 from neilLasrado/opportunity-status
fixes for #2655
2015-02-06 16:04:42 +05:30
Nabin Hait
4ed51416e5 Merge pull request #2656 from neilLasrado/po-capacity-planning
fixes for production order
2015-02-06 16:04:08 +05:30
Neil Trini Lasrado
47a62c623c fixes for #2655 2015-02-06 15:51:20 +05:30
Nabin Hait
4ec5d5594b Merge pull request #2696 from nabinhait/fix1
net_total and grand_total mismatch issue
2015-02-06 15:43:10 +05:30
Nabin Hait
a3cb828ed3 progress bar in item grid 2015-02-06 13:00:33 +05:30
Anand Doshi
e241569303 Allow non-english characters in Naming Series 2015-02-06 12:56:26 +05:30
Anand Doshi
9b30a8626c [minor] removed default filters for sales order and material request, fixed pos css 2015-02-06 12:30:08 +05:30