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
Nabin Hait
5e13e0c316
net_total and grand_total mismatch issue
2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Pratik Vyas
bfeb7c4a57
Merge branch 'develop'
2015-02-05 15:44:06 +05:30
Pratik Vyas
43f627a83a
bumped to version 4.21.1
2015-02-05 16:14:06 +06:00
Anand Doshi
d0b3a3734e
Merge pull request #2693 from anandpdoshi/anand-feb-5
...
Fixed call to calculate
2015-02-05 15:25:25 +05:30
Nabin Hait
94365fa035
Merge pull request #2694 from nabinhait/fix1
...
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:22:28 +05:30
Nabin Hait
e0ce9407cb
divisional loss adjustment while doing gl entry for purchase receipt
2015-02-05 15:12:37 +05:30
Anand Doshi
dea3fb0d64
[fix] call calculate code only once after applying pricing rule
2015-02-05 15:06:16 +05:30
Pratik Vyas
1dae1c40b9
Merge branch 'develop'
2015-02-05 14:25:13 +05:30
Pratik Vyas
fd654a06e8
bumped to version 4.21.0
2015-02-05 14:55:13 +06:00
Nabin Hait
5bf1f89da7
Merge pull request #2669 from nathando/patch-2
...
Look like a minor bug
2015-02-05 13:48:47 +05:30
Nabin Hait
b6c8c7436f
Merge pull request #2691 from nabinhait/fix1
...
item-wise tax distribution if amount entered in actual
2015-02-05 10:31:30 +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
Neil Trini Lasrado
59a706585c
actual start and end date made blank if islocal
2015-02-04 11:44:24 +05:30
Neil Trini Lasrado
de164c91e0
actual start and end date calculation - call moved to submit and cancel of Time Log
2015-02-04 11:35:10 +05:30
Neil Trini Lasrado
2017796de7
fixes in auto create time logs
2015-02-04 11:16:49 +05:30
Neil Trini Lasrado
a9b3ec180e
fixes for productiojn order
2015-02-04 11:16:49 +05:30
Rushabh Mehta
b736443e3f
[patch] [fix]
2015-02-04 10:40:02 +05:30
Nabin Hait
279bb6f3ed
Merge pull request #2628 from neilLasrado/batch-validation
...
Batch Validation
2015-02-03 18:33:49 +05:30
