Commit Graph

38301 Commits

Author SHA1 Message Date
Juanjo Menent
ba8d094ec5 Merge pull request #1152 from atm-maxime/develop
Better fix for email text / signature integration
2013-08-02 03:13:42 -07:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
229c2d890f Add possibility to define default VAT accountancy code for purchase 2013-08-02 10:43:53 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Laurent Destailleur
8a0e0999f5 Merge pull request #1151 from ricardosequeira/develop
Improved translation
2013-08-01 15:17:11 -07:00
Ricardo Sequeira
4572ff5af5 Improved translation 2013-08-01 23:09:03 +01:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop
Task # 1016 : deposits numbering
2013-08-01 13:06:46 -07:00
Laurent Destailleur
1cec6383e7 Merge pull request #1149 from csalvador/hookcalls
print hooks results in thirdparty/contact cards
2013-08-01 13:02:12 -07:00
Laurent Destailleur
298a35a347 Merge pull request #1148 from csalvador/replenish-fix
init cond_reglement_id and mode_reglement_id to 0 in orders creations to...
2013-08-01 12:59:32 -07:00
Laurent Destailleur
b6b5479635 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-01 20:09:39 +02:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44: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