Commit Graph

62794 Commits

Author SHA1 Message Date
Laurent Destailleur
02cae88a8c Fix date output 2017-10-29 17:50:50 +01:00
Laurent Destailleur
33aa0f3160 Code comment 2017-10-29 17:49:24 +01:00
Laurent Destailleur
75bbcdf575 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-29 11:29:01 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
da1afa80cf
Merge pull request #7718 from Oeris/develop-api
FIX wrong paramters name in the usecreditnote method
2017-10-28 22:00:29 +02:00
Laurent Destailleur
46f95e14fa Fix select2 search 2017-10-28 17:34:46 +02:00
Laurent Destailleur
adc4db0f85 Standardize code 2017-10-28 16:55:25 +02:00
Laurent Destailleur
b9ca66943f Try to introduce param forcesandbox to test online payment easier 2017-10-28 16:32:19 +02:00
Laurent Destailleur
9676b83574 Google tag enabled also on mobile 2017-10-28 16:00:46 +02:00
Laurent Destailleur
00db7e16ec Clean code 2017-10-28 16:00:07 +02:00
Laurent Destailleur
9e382a7f1b Can disabled output of notify messages 2017-10-28 13:36:23 +02:00
Laurent Destailleur
1a49a2bb94 Clean css/code 2017-10-28 11:00:02 +02:00
Laurent Destailleur
9a5d532786 Fix website 2017-10-27 18:45:12 +02:00
Laurent Destailleur
013ab9405e Work on website module 2017-10-27 17:58:38 +02:00
Laurent Destailleur
815faf4c91 Fix css for website 2017-10-27 16:00:37 +02:00
Laurent Destailleur
01af1e3252 Work on website module 2017-10-27 15:42:48 +02:00
Laurent Destailleur
a40bebec40 Fix translation of module descriptions 2017-10-27 13:06:14 +02:00
Laurent Destailleur
dd6ccf5095 Fix template 2017-10-27 10:48:48 +02:00
Laurent Destailleur
1adfc02724 Fix hook not visible when using old syntax 2017-10-27 10:05:21 +02:00
Neil Orley
9a1c684870 FIX wrong paramters name in the usecreditnote method
Rename 'creditnoteid' with 'discountid' in the URI
Rename 'creditId' with 'discountid' in the method
2017-10-27 10:02:17 +02:00
Neil Orley
fbabacf19a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-27 09:48:24 +02:00
Laurent Destailleur
e31223d7be Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-27 02:33:14 +02:00
Laurent Destailleur
6b7c59635e Merge pull request #7715 from grandoc/new_branch_26_10_17
Fix : Warning: A non-numeric value encountered in on line 57 58 59
2017-10-27 02:18:26 +02:00
Laurent Destailleur
61909d842d Update document.php 2017-10-27 02:18:11 +02:00
Laurent Destailleur
4c5bb7660c Merge pull request #7713 from atm-gauthier/6.0_fix_hook_on_shipping_card
FIX : hook formObjectOptions() must use $expe and not $object which i…
2017-10-27 02:15:30 +02:00
Laurent Destailleur
5285f3ee15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-27 02:12:55 +02:00
Laurent Destailleur
e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php
2017-10-27 02:12:35 +02:00
Laurent Destailleur
bbc13b8ac9 Merge pull request #7712 from atm-florian/6.0
FIX : #7458
2017-10-27 01:58:51 +02:00
Laurent Destailleur
71622b9f86 Merge pull request #7711 from atm-ph/fix_6_0_empty_extrafields
Fix empty extrafields if from origin
2017-10-27 01:56:44 +02:00
Laurent Destailleur
a00cf6b28b Merge pull request #7708 from Elimig/patch-3
Fix don't show title in tooltip
2017-10-27 01:55:14 +02:00
Laurent Destailleur
00b505a71c Fix sql syntax 2017-10-27 01:48:05 +02:00
Laurent Destailleur
82231b77a2 Fix data for supplier must be not visible if supplier module off 2017-10-27 01:46:54 +02:00
Laurent Destailleur
44f441f07b Merge pull request #7706 from aspangaro/7.0-pcg6
NEW Add The Moroccan chart of accounts
2017-10-27 01:42:45 +02:00
Laurent Destailleur
1e03c8f085 Merge branch 'develop' into 7.0-pcg6 2017-10-27 01:42:38 +02:00
Laurent Destailleur
5ba64fe620 Merge branch 'develop' into 7.0-pcg6 2017-10-27 01:42:03 +02:00
Laurent Destailleur
ba9ed52bc0 Fix sql norm (string must be ') 2017-10-27 01:40:41 +02:00
Laurent Destailleur
54746a55b5 Merge pull request #7705 from aspangaro/7.0-pcg5
NEW Add The SYSCOHADA chart of accounts
2017-10-27 01:17:47 +02:00
Laurent Destailleur
ee1996ad37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
740c89365d Code comment 2017-10-27 00:42:44 +02:00
Laurent Destailleur
6a9837528e Merge pull request #7703 from Oeris/develop-api
FIX Data related to customer moved to thirparties api
2017-10-27 00:42:10 +02:00
Laurent Destailleur
a741a6bb3e Update api_thirdparties.class.php 2017-10-27 00:41:56 +02:00
Laurent Destailleur
f4a06aef3f Update api_invoices.class.php 2017-10-27 00:36:06 +02:00
Laurent Destailleur
9283aaf6aa Fix scrutinizer 2017-10-27 00:07:58 +02:00
Laurent Destailleur
90bd9f2f4f Fix trad 2017-10-26 20:57:23 +02:00
Laurent Destailleur
a1f862eba6 NEW Enhance framework so we can use html/icons into SELECT options. 2017-10-26 20:06:23 +02:00
Laurent Destailleur
0a1b381bc5 Tired with emails 2017-10-26 18:50:27 +02:00
Laurent Destailleur
315fce701b Fix migration pgsql 2017-10-26 18:46:44 +02:00
Laurent Destailleur
653f5fcbbf Remove warning 2017-10-26 18:40:12 +02:00
Laurent Destailleur
708666349f Minor fix 2017-10-26 18:35:32 +02:00
Laurent Destailleur
d1e7577eed Fix sql field can't be named 'offset' (reserved word). 2017-10-26 18:30:01 +02:00