';
// Ref
- print ''.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Customer').' ';
- if ($soc->id > 0 && !GETPOST('fac_rec', 'alpha')) {
- print '';
+ if ($soc->id > 0)
+ {
+ print ' '.$langs->trans('ThirdParty').' ';
+ print '';
print $soc->getNomUrl(1);
print ' ';
} else {
- print '';
+ print ' '.$langs->trans('ThirdParty').' ';
+ print '';
print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
// Option to reload page to retrieve customer informations. Note, this clear other input
if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
@@ -386,7 +393,7 @@ if ($action == 'create') {
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
}
print ''."\n";
@@ -540,11 +547,15 @@ if (!empty($id) && $action == 'edit') {
print "";
print "\n";
- if ($object->socid && !empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+ if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
$company = new Societe($db);
- $result = $company->fetch($object->socid);
- print ''.$langs->trans("LinkedToDolibarrThirdParty").' '.$company->getNomUrl(1).' '.$langs->trans("ThirdParty").' ';
+ if ($object->socid > 0) {
+ $result = $company->fetch($object->socid);
+ print $company->getNomUrl(1);
+ }
+ print ' '.$langs->trans("Company").' '.$langs->trans("LinkedToDolibarrThirdParty").' '.$company->getNomUrl(1).' '.$langs->trans("ThirdParty").' ';
+ if ($object->socid > 0) {
+ $result = $company->fetch($object->socid);
+ print $company->getNomUrl(1);
+ }
+ print ' '.$langs->trans("Company").' '.$object->societe.' '.$langs->trans("Lastname").' '.$object->lastname.' ';
if (empty($amount) || !is_numeric($amount)) {
- print ''.price($amount).' ';
@@ -914,9 +914,13 @@ if ($source == 'order') {
if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
$amount = $order->total_ttc;
+<<<<<<< HEAD
if (GETPOST("amount", 'int')) {
$amount = GETPOST("amount", 'int');
}
+=======
+ if (GETPOST("amount", 'alpha')) $amount = GETPOST("amount", 'alpha');
+>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
$amount = price2num($amount);
}
@@ -965,8 +969,14 @@ if ($source == 'order') {
print ' ('.$langs->trans("ToComplete").')';
}
print ' ';
+<<<<<<< HEAD
if (empty($amount) || !is_numeric($amount)) {
print ''.price($amount).' ';
@@ -1038,9 +1048,13 @@ if ($source == 'invoice') {
if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
$amount = price2num($invoice->total_ttc - ($invoice->getSommePaiement() + $invoice->getSumCreditNotesUsed() + $invoice->getSumDepositsUsed()));
+<<<<<<< HEAD
if (GETPOST("amount", 'int')) {
$amount = GETPOST("amount", 'int');
}
+=======
+ if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'alpha');
+>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
$amount = price2num($amount);
}
@@ -1092,8 +1106,14 @@ if ($source == 'invoice') {
if ($object->type == $object::TYPE_CREDIT_NOTE) {
print ''.$langs->trans("CreditNote").' ';
} elseif (empty($object->paye)) {
+<<<<<<< HEAD
if (empty($amount) || !is_numeric($amount)) {
print ''.price($amount).' ';
@@ -1204,9 +1224,13 @@ if ($source == 'contractline') {
}
}
+<<<<<<< HEAD
if (GETPOST("amount", 'int')) {
$amount = GETPOST("amount", 'int');
}
+=======
+ if (GETPOST("amount", 'alpha')) $amount = GETPOST("amount", 'alpha');
+>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
$amount = price2num($amount);
}
@@ -1296,8 +1320,14 @@ if ($source == 'contractline') {
print ' ('.$langs->trans("ToComplete").')';
}
print ' ';
+<<<<<<< HEAD
if (empty($amount) || !is_numeric($amount)) {
print ''.price($amount).' ';
@@ -1370,10 +1400,15 @@ if ($source == 'membersubscription') {
if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
$amount = $subscription->total_ttc;
+<<<<<<< HEAD
if (GETPOST("amount", 'int')) {
$amount = GETPOST("amount", 'int');
}
$amount = price2num($amount);
+=======
+ if (GETPOST("amount", 'alpha')) $amount = GETPOST("amount", 'alpha');
+ $amount = price2num($amount, 'MT');
+>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
}
if (GETPOST('fulltag', 'alpha')) {
@@ -1470,15 +1505,30 @@ if ($source == 'membersubscription') {
}
if (empty($amount) || !is_numeric($amount)) {
//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
+<<<<<<< HEAD
if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
$valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
}
print ''.price($valtoshow).' ';
print ''.price($valtoshow).' ';
print '
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 57b8a06b019..e03d0fa7b6e 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
control->tpl['ismodifiable_customercode']) { ?>
-
control->tpl['ismodifiable_suppliercode']) { ?>
-
@@ -99,7 +99,7 @@ if (empty($conf) || !is_object($conf))
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index b5f57544c5f..ffdbe2c3016 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -73,7 +73,7 @@ if (empty($conf) || !is_object($conf))
control->tpl['ismodifiable_customercode']) { ?>
-
control->tpl['ismodifiable_suppliercode']) { ?>
- ';
$tmpcode = $object->code_client;
if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
- print ' ';
$s = $modCodeClient->getToolTip($langs, $object, 0);
print $form->textwithpicto('', $s, 1);
@@ -1321,7 +1321,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '';
$tmpcode = $object->code_fournisseur;
if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
- print ' ';
$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
print $form->textwithpicto('', $s, 1);
@@ -1942,10 +1942,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
$tmpcode = $object->code_client;
if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
- print '