Commit Graph

40348 Commits

Author SHA1 Message Date
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/core/lib/functions2.lib.php
2014-01-25 16:28:21 +01:00
Laurent Destailleur
98805ace4a Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:30:03 +01:00
Laurent Destailleur
7986c95ce3 Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:26:42 +01:00
Laurent Destailleur
372acbfb0d Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:25:42 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d Fix: doxygen errors 2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal
clone of propal improvements
2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
Laurent Destailleur
7254aecbb7 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-23 20:03:25 +01:00
Laurent Destailleur
21b43d7604 Fix: if module invoice is disabled, option to automatically classify
order as billed does not exists, so "Classify billed" for order must be
done manually from order card.
2014-01-23 20:02:19 +01:00
simnandez
714be2cd62 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:51 +01:00
simnandez
21d6e22f03 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:07 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
simnandez
72752f9a30 Fix: Bad navigation into stock product tab 2014-01-23 16:01:27 +01:00
simnandez
cd1313280c Fix: Bad navigation into stock product tab 2014-01-23 16:00:15 +01:00
Grand Philippe
2f2668d41f typo 2014-01-23 12:25:25 +01:00
Juanjo Menent
f634427f73 Merge pull request #1390 from grandoc/3.5
typo
2014-01-23 03:22:57 -08:00
simnandez
2866deb3c4 Thousand separator must be space into Spain 2014-01-23 12:18:57 +01:00
simnandez
35051f8c77 Thousand separator must be space into Spain 2014-01-23 12:18:15 +01:00
Maxime Kohlhaas
db90776400 Thousand separator has been set to None instead of space 2014-01-23 12:16:38 +01:00
Juanjo Menent
4c64767e7b Merge pull request #1392 from atm-maxime/3.5
Thousand separator has been set to None instead of space
2014-01-23 03:14:57 -08:00
Laurent Destailleur
ce24a7e9ad Fix: Bad error management making rollback instead of commit 2014-01-23 09:20:06 +01:00
Laurent Destailleur
9e7f3686db Fix: No message if module mailman disabled 2014-01-23 09:19:56 +01:00
Laurent Destailleur
5cfaca4942 Fix: Bad error management making rollback instead of commit 2014-01-23 09:19:15 +01:00
Maxime Kohlhaas
4f5441dc81 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-01-23 09:07:48 +01:00
Maxime Kohlhaas
eb7d802a8f Thousand separator has been set to None instead of space 2014-01-23 09:07:15 +01:00
Laurent Destailleur
82bc9e709b Fix: No message if module mailman disabled 2014-01-23 08:54:39 +01:00
philippe
021f6e90e2 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-22 08:09:44 +01:00
Laurent Destailleur
9341db3e86 Fix: Missing id 2014-01-22 03:20:18 +01:00
Grand Philippe
8a0bddf4c5 typo 2014-01-21 18:55:45 +01:00
Christophe Battarel
81bae5fff9 fix wrong constant usage 2014-01-21 18:33:25 +01:00
Laurent Destailleur
8666524446 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-21 15:28:18 +01:00
Laurent Destailleur
8cdd0502b7 Fix: Syntax error 2014-01-21 15:27:32 +01:00
Laurent Destailleur
f3774cc5e1 Merge pull request #1385 from defrance69/patch-24
Update fournisseur.class.php
2014-01-21 05:05:20 -08:00
Laurent Destailleur
b8aee5f462 Merge pull request #1388 from FHenry/3.4
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17 remove debug 2014-01-21 13:48:47 +01:00
Florian Henry
79c2e31439 Fix mask 2014-01-21 13:47:48 +01:00
Laurent Destailleur
2c0c3ce241 Merge pull request #1383 from atm-maxime/develop
Allow to clone an invoice on a different third
2014-01-21 04:46:18 -08:00
Laurent Destailleur
3852fe4a1c Merge pull request #1380 from atm-alexis/3.5
Add right to export project in export tool
2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Léo
46926aa685 Fix: modBarcode issue with blank list in conf (?)
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 13:19:32 +01:00
Laurent Destailleur
d7e111b3bd Fix: Missing parent tables 2014-01-21 13:18:30 +01:00
Laurent Destailleur
8bd2a1bc32 Merge pull request #1384 from Pfontaine/fix/societe2contact_civilite
Fix: add civilite_id field in contact when create new third party.
2014-01-21 04:12:47 -08:00
Laurent Destailleur
709edca05c Merge pull request #1386 from zongap/patch-1
Fix: modBarcode issue with blank list in conf (?)
2014-01-21 04:11:32 -08:00
Laurent Destailleur
d35cbb27de Merge pull request #1387 from atm-maxime/3.5
Fix : big bug while importing thirds
2014-01-21 04:03:45 -08:00
Florian Henry
57f8f30494 Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with
date 2014-01-01)
2014-01-21 12:57:32 +01:00