Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
d8778ce0f7 Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:52:21 +02:00
Laurent Destailleur
a144b1307b Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:49:17 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Maxime Kohlhaas
eccbf89ecd Bank account sharing for multi company 2013-08-01 16:15:53 +02:00
Cédric Salvador
69d6b6f348 print hooks results in thirdparty/contact cards 2013-08-01 16:02:37 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Cédric Salvador
3c93aac071 init cond_reglement_id and mode_reglement_id to 0 in orders creations to avoid SQL errors 2013-08-01 15:03:47 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Laurent Destailleur
af026690d4 Fix: Bad sql requests 2013-08-01 12:22:05 +02:00
Laurent Destailleur
2fa1032079 Merge pull request #1145 from atm-maxime/develop
Fix : email message combined with html signature made troubles with line breaks
2013-08-01 02:09:52 -07:00
Laurent Destailleur
9f25b457ad Fix: CSS 2013-08-01 05:23:15 +02:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
70eef21bc8 Fix: Style with jmobile 2013-08-01 04:36:54 +02:00
Laurent Destailleur
e9df22dcc0 Fix: restore lost info into changelog.
Add note of todo for next versions.
2013-08-01 04:28:12 +02:00
Laurent Destailleur
53672dff75 Fix: Confirm boxes with jmobile 2013-08-01 04:20:08 +02:00
Laurent Destailleur
a334b96469 Optimize screen size 2013-08-01 02:28:47 +02:00
Laurent Destailleur
0a2ed1f678 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-01 02:20:52 +02:00
Laurent Destailleur
4d1c0916f9 Merge pull request #1147 from FHenry/develop
[ task #1014 ] Add option to recursivly add parent category
2013-07-31 16:23:40 -07:00
Florian Henry
c5cec980c8 Fix spelling 2013-07-31 21:55:32 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
df0a8e0829 Fix: Bad link 2013-07-31 18:43:37 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
eccfd33c38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-31 16:36:22 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Maxime Kohlhaas
3395df2b66 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 15:23:27 +02:00
Laurent Destailleur
6a998b202d Update doc 2013-07-31 15:21:48 +02:00
Laurent Destailleur
6e289874fe Merge pull request #1146 from csalvador/callfix
fixed bad function call causing select_produits_list to fail
2013-07-31 05:52:19 -07:00
Laurent Destailleur
68e13b09e9 Enhance tx tool. 2013-07-31 14:11:58 +02:00
Laurent Destailleur
6351c64a62 Test tx 2013-07-31 13:49:24 +02:00
Laurent Destailleur
37e28d8448 Removed key not used 2013-07-31 13:22:45 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Laurent Destailleur
f765288f12 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
2013-07-31 12:38:15 +02:00
Laurent Destailleur
fbd3f6e67f Fix: Maxi debug of scripts 2013-07-31 12:33:18 +02:00
Laurent Destailleur
384e3812eb Fix: W3C. No form into TR. 2013-07-31 11:41:25 +02:00
Laurent Destailleur
378842e05f Fix: Better error management 2013-07-31 11:27:56 +02:00
Laurent Destailleur
c4ebdf18e7 Fix: search on contract ref 2013-07-31 11:22:52 +02:00
Laurent Destailleur
ecfca853a1 Fix: Search on contract ref 2013-07-31 11:21:05 +02:00
Laurent Destailleur
8fed036c92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-31 11:20:11 +02:00
Laurent Destailleur
0b13781cbf Fix: Search on contract ref 2013-07-31 11:19:49 +02:00
Cédric Salvador
f0bbdfddfb fixed bad function call causing select_produits_list to fail 2013-07-31 10:08:33 +02:00
Maxime Kohlhaas
27cfe802aa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 09:03:20 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management
for project.
2013-07-30 19:08:58 +02:00
Laurent Destailleur
db8af86111 Fix: W3C 2013-07-30 18:36:13 +02:00
Juanjo Menent
ba328b8710 Merge pull request #1144 from FHenry/develop
Finnalise categorie contact
2013-07-30 08:39:13 -07:00
Maxime Kohlhaas
c40e187842 Typo 2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5 Fix : email message combined with html signature made troubles with line breaks 2013-07-30 17:29:24 +02:00