Commit Graph

64295 Commits

Author SHA1 Message Date
Rui Strecht
bddf292881 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-11 11:52:47 +01:00
Laurent Destailleur
7d42a58230 Fix no more fk_soc in this table 2017-09-11 12:46:01 +02:00
Neil Orley
a300a635d8 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-11 12:14:09 +02:00
Regis Houssin
f8938f308d Fix: remove table prefix 2017-09-11 08:17:25 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
34221fc163 CSS of payment page 2017-09-11 03:38:39 +02:00
Laurent Destailleur
61a0f04bbe FIX dateSelector was not taken into account 2017-09-11 03:30:45 +02:00
Laurent Destailleur
214bad26db Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
timezone > 0
2017-09-11 03:30:10 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
974f99ddb2 Increase length of title field 2017-09-11 02:54:21 +02:00
Laurent Destailleur
c8cb66d227 Missing translation 2017-09-11 02:54:06 +02:00
Laurent Destailleur
9253207842 NEW template invoices support substition key
__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__
__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__
2017-09-11 02:11:31 +02:00
Laurent Destailleur
3e6ac36025 Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
timezone > 0
2017-09-11 02:09:48 +02:00
Laurent Destailleur
ca5ef5cb11 FIX dateSelector was not taken into account 2017-09-11 01:20:15 +02:00
Laurent Destailleur
26385fa10d FIX Clean bad parameters when inserting line of template invoice
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
2017-09-11 01:06:48 +02:00
Laurent Destailleur
d13c4b7b84 Better autosize of extrafields 2017-09-11 01:05:55 +02:00
Laurent Destailleur
86b28a01c7 FIX Clean bad parameters when inserting line of template invoice 2017-09-11 01:04:53 +02:00
Laurent Destailleur
25ec124411 Better autosize of extrafields 2017-09-11 00:19:42 +02:00
Laurent Destailleur
cb0c7d6594 Standardize search field name 2017-09-11 00:10:23 +02:00
Laurent Destailleur
cb7456239b Remove deprecated file 2017-09-11 00:03:05 +02:00
Laurent Destailleur
cf56da8102 NEW Default filter and sort order can use partial list of query
parameters to set the qualified URLs.
2017-09-11 00:02:52 +02:00
Laurent Destailleur
903df90f8a NEW Can edit with delete/insert a forced translation 2017-09-10 22:46:08 +02:00
Laurent Destailleur
3afc90c88f Fix missing translation 2017-09-10 22:26:45 +02:00
Laurent Destailleur
9f1e349506 Add hidden option message ONLINE_PAYMENT_MESSAGE_FORMIFVAT 2017-09-10 22:24:26 +02:00
Laurent Destailleur
2ae135baf1 NEW Add view of status of template invoice 2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Laurent Destailleur
c315ad7801 Fix missing tables into childtables 2017-09-10 18:04:13 +02:00
Laurent Destailleur
01664a135d Removed not used field 2017-09-10 18:01:34 +02:00
Laurent Destailleur
2db71cb773 Fix missing tables into childtables 2017-09-10 18:01:20 +02:00
Gitdyr
7f8d791d39 Revert "Remove processing by htmlentities()"
This reverts commit e555233dc1.
2017-09-10 07:24:38 +02:00
Gitdyr
68a8ef6e2d Fixed. 2017-09-09 22:21:55 +02:00
Gitdyr
8dbf4bfaee Danish accounting accounts. 2017-09-09 21:19:02 +02:00
reeperbahnause
698a047573 fix #7361 missing generateDocument function
fix #7361  
Function generateDocument was missing for Class Fichinter
2017-09-09 20:00:09 +02:00
Regis Houssin
762b4eb876 Fix: some problems with medias in multicompany 2017-09-09 17:48:04 +02:00
Regis Houssin
67e9b65a2e Fix: use $array_key value instead 2017-09-09 17:07:08 +02:00
Regis Houssin
a8fdf0b5ea Fix: missing salaries upgrade reload module 2017-09-09 16:49:26 +02:00
Regis Houssin
7404a6cf98 Fix: avoid htmlentities 2017-09-09 12:15:59 +02:00
Regis Houssin
db02c32a9f Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3 2017-09-09 12:14:22 +02:00
Kjeld Borch Egevang
e555233dc1 Remove processing by htmlentities()
When translated texts contain international characters they are unintentionally changed by htmlentities().

You can see the problem at the admin/index.php page (language set to French):

  Les paramètres dans le menu Configuration -> Société/Organisation sont requis car les données définies sont utilisées dans l'affichage Dolibarr et pour personnaliser le comportement par défaut du logiciel (pour les fonctionnalités liées à un pays par exemple).
2017-09-09 11:29:30 +02:00
Laurent Destailleur
026f9d8e2a Can set a dedicated message on payment forms 2017-09-09 10:54:30 +02:00
Laurent Destailleur
c7537732d2 NEW Can set a dedicated message on payment forms 2017-09-09 10:03:09 +02:00
Laurent Destailleur
591834a807 Add a message on payment forms 2017-09-09 09:54:42 +02:00
Regis Houssin
c1c75208ec Fix: missing parameters for filter and sort (contact list) 2017-09-09 09:46:21 +02:00
Laurent Destailleur
66cba0ad61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-09 09:43:49 +02:00
Laurent Destailleur
b645aeb954 Fix lang loading 2017-09-09 09:41:07 +02:00
Laurent Destailleur
4f52871c67 Merge pull request #7345 from AXeL-dev/develop
fix hidepriceinlabel when using ajax autocompleter
2017-09-08 21:22:38 +02:00
Laurent Destailleur
bb53146192 Merge pull request #7348 from hregis/6.0_bug2
Fix: missing parameters for filter and sort
2017-09-08 21:22:01 +02:00
Laurent Destailleur
23c5b0366f Merge pull request #7344 from atm-florian/6.0_fixphotocateg
6.0 fixphotocateg
2017-09-08 21:21:26 +02:00
Regis Houssin
310e912a9d Fix: missing parameters for filter and sort 2017-09-08 19:57:59 +02:00
Laurent Destailleur
c498ce3c41 FIX journalization for bank journal should not rely on a label. 2017-09-08 17:50:39 +02:00