浏览代码

FIX: Fix errors or missing langs for MO and BOM

Kamel Khelifa 1 年之前
父节点
当前提交
8a3c0491ec

+ 2 - 2
htdocs/admin/bomline_extrafields.php

@@ -65,11 +65,11 @@ require DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
  */
 
 $help_url = '';
-llxHeader('', $langs->trans("BOMLinesSetup"), $help_url);
+llxHeader('', $langs->trans("BOMsSetup"), $help_url);
 
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans("BOMLinesSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 
 $head = bomAdminPrepareHead();

+ 1 - 0
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php

@@ -1089,6 +1089,7 @@ class pdf_vinci extends ModelePDFMo
 
 		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
+		$w = 100;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 

+ 2 - 0
htdocs/langs/en_US/mrp.lang

@@ -122,3 +122,5 @@ BOMServicesList=BOM's services
 Manufacturing=Manufacturing
 Disassemble=Disassemble
 ProducedBy=Produced by
+QtyTot=Qty Total
+InProgress=In progress

+ 2 - 0
htdocs/langs/fr_FR/mrp.lang

@@ -122,3 +122,5 @@ BOMServicesList=Les services de BOM
 Manufacturing=Fabrication
 Disassemble=Déassemblage
 ProducedBy=Produit par
+QtyTot=Qty Total
+InProgress=En cours

+ 1 - 1
htdocs/mrp/mo_card.php

@@ -423,7 +423,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV') {
 			$object->fetch_product();
-			$numref = $object->getNextNumRef($object->fk_product);
+			$numref = $object->getNextNumRef($object->product);
 		} else {
 			$numref = $object->ref;
 		}

+ 1 - 1
htdocs/mrp/mo_list.php

@@ -625,7 +625,7 @@ while ($i < $imaxinloop) {
 		$objectBom = $bom->fetch($obj->fk_bom);
 
 		// Output Kanban
-		print $object->getKanbanView('', array('bom'=>$objectBom->getNomUrl(1), 'selected' => in_array($object->id, $arrayofselected)));
+		print $object->getKanbanView('', array('bom'=>$bom->getNomUrl(1), 'selected' => in_array($object->id, $arrayofselected)));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';

+ 2 - 2
htdocs/mrp/mo_movements.php

@@ -991,10 +991,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
+			if (in_array($objp->rowid, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '<input id="cb'.$objp->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {

+ 2 - 2
htdocs/mrp/mo_production.php

@@ -182,7 +182,7 @@ if (empty($reshook)) {
 		$resultline = $moline->create($user, false); // Never use triggers here
 		if ($resultline <= 0) {
 			$error++;
-			setEventMessages($moline->error, $molines->errors, 'errors');
+			setEventMessages($moline->error, $moline->errors, 'errors');
 		}
 
 		$action = '';
@@ -486,7 +486,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV') {
 			$object->fetch_product();
-			$numref = $object->getNextNumRef($object->fk_product);
+			$numref = $object->getNextNumRef($object->product);
 		} else {
 			$numref = $object->ref;
 		}