Commit Graph

10656 Commits

Author SHA1 Message Date
Neil Trini Lasrado
31a92bd9d9 company wise letter head feature added 2014-12-23 17:52:41 +05:30
Nabin Hait
b0b7e7fdf8 Merge pull request #2497 from neilLasrado/batch-redesign
batch redesigned
2014-12-23 17:44:41 +05:30
Nabin Hait
95225be93d Merge pull request #2509 from pdvyas/fix-patches
add reload_doc in a few patches
2014-12-23 17:43:52 +05:30
Nabin Hait
496dfc4bbf Merge branch 'neil_capacity_planning' into v5.0 2014-12-23 17:40:46 +05:30
Nabin Hait
89c52eacc7 Actual operation cost in stock entry, fixed cost removed from bom and workstation 2014-12-23 17:39:00 +05:30
Nabin Hait
0de6256bcc time log and workstations 2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61 capacity planning fixes and cleanup 2014-12-23 17:39:00 +05:30
Nabin Hait
1fa7171bfa minor fixes 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
41781ce686 test case fix - holiday list 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
9712e7dad4 holiday logic removed 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30 Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519 Holiday List name changed and workstation filter added to time log 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
812cd8a8ce Prod Order Form Modified 2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log 2014-12-23 17:38:59 +05:30
Nabin Hait
e5d169b8d2 Merge pull request #2521 from nabinhait/fix1
fixed negative batch wty message
2014-12-23 11:26:04 +05:30
Nabin Hait
da4e3fb366 fixed negative batch wty message 2014-12-23 10:58:01 +05:30
Nabin Hait
13ce150149 Merge pull request #2520 from nabinhait/fix1
minor fix no-copy
2014-12-22 15:07:28 +05:30
Nabin Hait
a04489a72b minor fix no-copy 2014-12-22 14:58:36 +05:30
Pratik Vyas
35cd88b09b Merge branch 'develop' 2014-12-22 11:17:45 +05:30
Pratik Vyas
ff56566506 bumped to version 4.15.1 2014-12-22 11:47:45 +06:00
Nabin Hait
01ad94bfad Merge pull request #2519 from nabinhait/fix1
Dont reset pricing if ignore pricing rule
2014-12-22 11:16:02 +05:30
Nabin Hait
cfe3c54ca0 Dont reset pricing if ignore pricing rule 2014-12-22 10:43:10 +05:30
Pratik Vyas
2f6a20a93a Merge branch 'develop' 2014-12-19 18:13:55 +05:30
Pratik Vyas
5d1543f241 bumped to version 4.15.0 2014-12-19 18:43:55 +06:00
Nabin Hait
c56650c773 Merge pull request #2516 from nabinhait/fix1
Customer should not copied from lead to opoortunity
2014-12-19 10:52:52 +05:30
Nabin Hait
cb11f27558 Customer should not copied from lead to opoortunity 2014-12-19 10:51:59 +05:30
Anand Doshi
98be98816c Merge pull request #2515 from anandpdoshi/anand-dec-18
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:40:58 +05:30
Anand Doshi
ca2c297f72 [fix] In Setup Wizard, load languages from languages.txt 2014-12-18 17:31:21 +05:30
Pratik Vyas
0a726e2335 add reload doc to patch 2014-12-18 12:41:09 +05:30
Pratik Vyas
387e1e21cb add reload_doc in a few patches 2014-12-18 11:36:23 +05:30
Pratik Vyas
dc2630b7fa Make Tax Assets a group in standard chart of accounts 2014-12-17 16:23:51 +05:30
Nabin Hait
f4ec673a06 Merge pull request #2488 from neilLasrado/bom-currency-fix
Bom Currency Fix
2014-12-17 15:42:13 +05:30
Nabin Hait
d6e49150a8 Merge pull request #2505 from nabinhait/fix1
Reapply price list if pricing rule reset as blank
2014-12-17 15:39:28 +05:30
Nabin Hait
49a2729663 Reapply price list if pricing rule reset as blank 2014-12-17 11:24:00 +05:30
Pratik Vyas
06baf20edd Merge branch 'develop' 2014-12-16 15:47:07 +05:30
Pratik Vyas
13553c2bf0 bumped to version 4.14.0 2014-12-16 16:17:06 +06:00
Nabin Hait
f638c1acd5 Merge pull request #2503 from nabinhait/fix1
packing list index
2014-12-16 15:17:27 +05:30
Nabin Hait
e4c659386a packing list index 2014-12-16 15:16:55 +05:30
Nabin Hait
6ffa445dfd minor fixes in coa templates 2014-12-16 12:49:35 +05:30
Nabin Hait
b072c74efc render address and contacts for party 2014-12-16 12:49:13 +05:30
Anand Doshi
cd7a1661c6 Merge pull request #2498 from anandpdoshi/anand-dec-15
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-16 12:42:40 +05:30
Nabin Hait
96962e2101 Merge pull request #2501 from nabinhait/fix1
Fecth contact details on change of contact in purchase transactions
2014-12-16 11:57:11 +05:30
Nabin Hait
7eedebc970 Fecth contact details on change of contact in purchase transactions 2014-12-16 11:56:21 +05:30
Nabin Hait
437e34accb Merge pull request #2500 from nabinhait/fix1
no copy property for customer's po no
2014-12-16 11:26:08 +05:30
Nabin Hait
0f2137be18 no copy property for customer's po no 2014-12-16 10:37:55 +05:30
Anand Doshi
f87a622ef0 [minor] use frappe.attach_print() in salary slip and recurring document 2014-12-15 23:14:35 +05:30
Neil Trini Lasrado
26320fc755 batch redesigned 2014-12-15 17:42:33 +05:30
Nabin Hait
07722b835c Merge pull request #2495 from nabinhait/fix1
Translation fixes
2014-12-15 15:00:12 +05:30
Nabin Hait
3cd7a45c1b Translation fixes 2014-12-15 14:56:58 +05:30
Nabin Hait
b2a84c7cd9 modified date updated in supplier.json 2014-12-15 14:22:14 +05:30