Commit Graph

41539 Commits

Author SHA1 Message Date
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
geoffrey.girard
7f59def98b Correction trigger on update product buyprice 2014-01-22 10:44:23 +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
Florian Henry
a7c892e23b Fix Mask numbering 2014-01-21 14:18:00 +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
163fcc8179 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-21 12:58:47 +01:00
Florian Henry
398e286be9 Fix reset Mask (befor do not work with FA{yy}{mm}-{0000@99} and date
2014-01-01)
2014-01-21 12:58:25 +01: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
Laurent Destailleur
23e6709164 Better error message 2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70 Fix: Missing parent tables 2014-01-21 12:53:27 +01:00
Maxime Kohlhaas
60e616f63e Fix : big bug while importing thirds, codes were not properly set or not imported 2014-01-21 10:29:35 +01:00
Maxime Kohlhaas
06bbc48399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-21 09:03:25 +01:00
Léo
6c00fc33f2 Fix: modBarcode issue with blank list in conf (?)
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
30aae38efa Removed POST usage. 2014-01-20 14:23:37 +01:00
Laurent Destailleur
70debe9d9f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b Fix: Support for reset everymonth (@99 into numbering mask) was ko when
changing year.
2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
fb0a4803c2 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
2014-01-20 02:40:06 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00