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

Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2013-06-03 11:09:40 +02:00
commit 6cf1d25529
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -88,10 +88,12 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- If module use hook pdf_writelinedesc, module may have to add return 1 at end of - If module use hook pdf_writelinedesc, module may have to add return 1 at end of
function to keep same behaviour. function to keep same behaviour.
***** ChangeLog for 3.3.3 compared to 3.3.2 *****
- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
***** ChangeLog for 3.3.2 compared to 3.3.1 ***** ***** ChangeLog for 3.3.2 compared to 3.3.1 *****
- Fix: Dutch (nl_NL) translation - Fix: Dutch (nl_NL) translation
- Generalize fix: file with a specific mask not found, again - Generalize fix: file with a specific mask not found, again
- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger - Fix: translations and BILL_SUPPLIER_BUILDDOC trigger
@ -120,8 +122,8 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #788 ] Date of linked interventions are not shown - Fix: [ bug #788 ] Date of linked interventions are not shown
- Fix: external users should not see costprice and margin infos - Fix: external users should not see costprice and margin infos
- Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order - Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order
***** ChangeLog for 3.3.1 compared to 3.3 *****
***** ChangeLog for 3.3.1 compared to 3.3 *****
- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag - Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
- Fix: Package for launchpad - Fix: Package for launchpad
- Fix: [ bug #736 ] Missing column in llx_c_chargesociales - Fix: [ bug #736 ] Missing column in llx_c_chargesociales
@ -129,8 +131,6 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #762 ] Bad profit calculation in Reporting - Fix: [ bug #762 ] Bad profit calculation in Reporting
- Fix: bug dictionnary with wrong prefix table - Fix: bug dictionnary with wrong prefix table
***** ChangeLog for 3.3 compared to 3.2.3 ***** ***** ChangeLog for 3.3 compared to 3.2.3 *****
For users: For users:
- New: Add holiday module, to declare and follow holidays of your employees. - New: Add holiday module, to declare and follow holidays of your employees.

1
htdocs/commande/liste.php
View File

@ -28,6 +28,7 @@
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

2
htdocs/langs/es_MX/banks.lang
View File

@ -1,5 +1,3 @@
# Dolibarr language file - es_MX - banks # Dolibarr language file - es_MX - banks
CHARSET=UTF-8 CHARSET=UTF-8
IBAN=CLAVE Interbancaria
BIC=Sucursal
BankAccountDomiciliation=Tarjeta BankAccountDomiciliation=Tarjeta

2
htdocs/langs/es_MX/bills.lang
View File

@ -23,6 +23,4 @@ TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las f
AddCreditNote=Crear nota de crédito AddCreditNote=Crear nota de crédito
BillTo=Receptor BillTo=Receptor
Residence=Tarjeta Residence=Tarjeta
IBANNumber=CLAVE Interbancaria
BICNumber=Sucursal
PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias

12
htdocs/product/class/product.class.php
View File

@ -2166,13 +2166,13 @@ class Product extends CommonObject
'fullpath' => $compl_path.$label, // Label 'fullpath' => $compl_path.$label, // Label
'type'=>$type // Nb of units that compose parent product 'type'=>$type // Nb of units that compose parent product
); );
}
// Recursive call if child is an array // Recursive call if child is an array
if (is_array($desc_pere['childs'])) if (is_array($desc_pere['childs']))
{ {
//print 'YYY We go down for '.$desc_pere[3]." -> \n"; //print 'YYY We go down for '.$desc_pere[3]." -> \n";
$this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1); $this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
}
} }
} }
} }