lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-01 19:38:11 +02:00
commit 8d08290f21
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/filemanagerdol/browser/default/frmupload.php
View File

@ -122,6 +122,7 @@ window.onload = function()
</head> </head>
<body> <body>
<form id="frmUpload" action="" target="frmUploadWorker" method="post" enctype="multipart/form-data" onsubmit="return OnSubmit();"> <form id="frmUpload" action="" target="frmUploadWorker" method="post" enctype="multipart/form-data" onsubmit="return OnSubmit();">
<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
<table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0"> <table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0">
<tr> <tr>
<td class="nowrap"> <td class="nowrap">

15
htdocs/product/card.php
View File

@ -78,6 +78,14 @@ $confirm = GETPOST('confirm', 'alpha');
$socid = GETPOST('socid', 'int'); $socid = GETPOST('socid', 'int');
$duration_value = GETPOST('duration_value', 'int'); $duration_value = GETPOST('duration_value', 'int');
$duration_unit = GETPOST('duration_unit', 'alpha'); $duration_unit = GETPOST('duration_unit', 'alpha');
$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
$accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
$accountancy_code_sell_export = GETPOST('accountancy_code_sell_export', 'alpha');
$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
if (!empty($user->socid)) $socid = $user->socid; if (!empty($user->socid)) $socid = $user->socid;
$object = new Product($db); $object = new Product($db);
@ -1323,6 +1331,13 @@ else
} }
else // For external software else // For external software
{ {
if (!empty($accountancy_code_sell)) { $object->accountancy_code_sell = $accountancy_code_sell; }
if (!empty($accountancy_code_sell_intra)) { $object->accountancy_code_sell_intra = $accountancy_code_sell_intra; }
if (!empty($accountancy_code_sell_export)) { $object->accountancy_code_sell_export = $accountancy_code_sell_export; }
if (!empty($accountancy_code_buy)) { $object->accountancy_code_buy = $accountancy_code_buy; }
if (!empty($accountancy_code_buy_intra)) { $object->accountancy_code_buy_intra = $accountancy_code_buy_intra; }
if (!empty($accountancy_code_buy_export)) { $object->accountancy_code_buy_export = $accountancy_code_buy_export; }
// Accountancy_code_sell // Accountancy_code_sell
print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">'; print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';