Laurent Destailleur
849b3b640b
Code comment
2019-02-01 13:41:23 +01:00
florian HENRY
f7bed44441
FIX : quick search for supplier orders
2019-01-31 21:39:02 +01:00
Laurent Destailleur
c05628c746
Fix edit member module setup
2019-01-31 20:27:55 +01:00
Pierre Ardoin
2d6f5ca8ab
#Fix : Error in Total Products/Services
...
Its correct an error in the total of stat Products/Services total.
2019-01-31 20:22:56 +01:00
Laurent Destailleur
0a56069f67
Fix trans
2019-01-31 19:42:55 +01:00
Laurent Destailleur
189323ad58
Fix when using image into description
2019-01-31 18:12:34 +01:00
Laurent Destailleur
4254ad0d33
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700
FIX Missing field in import/export of users
2019-01-31 15:51:02 +01:00
Laurent Destailleur
57797b1309
Remove image
2019-01-31 12:48:51 +01:00
gauthier
caa937660d
FIX : wrong test enabled
2019-01-31 12:43:39 +01:00
gauthier
bfc7265cbc
FIX : better test on fetch
2019-01-31 11:53:10 +01:00
gauthier
09ba059c21
FIX : need an order by in case we found other invoice with same number but not same date
2019-01-31 11:03:06 +01:00
Laurent Destailleur
484b4371c1
FIX XSS
...
Conflicts:
htdocs/viewimage.php
2019-01-31 10:19:23 +01:00
Laurent Destailleur
5e46a359e0
FIX XSS
2019-01-31 10:18:06 +01:00
Laurent Destailleur
21c089fee9
FIX XSS
2019-01-31 10:17:29 +01:00
gauthier
0c4e5a6487
FIX : better test
2019-01-31 09:30:07 +01:00
Laurent Destailleur
045b8b13ed
css
2019-01-30 23:20:57 +01:00
Laurent Destailleur
01f1f6162f
Fix phpcs
2019-01-30 20:06:21 +01:00
Laurent Destailleur
c1f3f4c2b5
Fix: text for empty line not visible in select
2019-01-30 20:03:04 +01:00
Laurent Destailleur
f67937c59d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-30 18:53:56 +01:00
Laurent Destailleur
231395dab8
Merge pull request #10398 from atm-john/fix_trigger
...
Fix missing trigger
2019-01-30 18:53:10 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
41e20a9d4f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-30 16:44:08 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
97248a830b
FIX #10440
2019-01-30 16:28:37 +01:00
Laurent Destailleur
0fbf578edb
Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images
...
FIX css in the case of not showing topmenu images.
2019-01-30 16:15:40 +01:00
Laurent Destailleur
104364ed02
Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled
...
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
2019-01-30 15:51:09 +01:00
Laurent Destailleur
869159c09f
Fix regression in look and feel (if empty, we do not sho value)
2019-01-30 15:31:39 +01:00
Laurent Destailleur
1a292839ca
Fix regression in look and feel (if empty, we do not sho value)
2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 15:25:43 +01:00
Laurent Destailleur
96f46ec261
Merge pull request #10448 from hregis/8.0_mc
...
FIX multicompany compatibility
2019-01-30 15:25:16 +01:00
Laurent Destailleur
340412ed00
FIX generation of document for supplie rinvoice
2019-01-30 14:07:50 +01:00
Laurent Destailleur
f955f3f4ee
Fix report error only if return code < 0
2019-01-30 12:23:34 +01:00
gauthier
9490929216
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
2019-01-30 10:49:32 +01:00
gauthier
412940b5ca
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
2019-01-30 10:19:13 +01:00
Pierre Ardoin
99892c13b0
FIX : Erreur dans le Total
...
Corrige l'erreur de calcul dans le total des produits et services
2019-01-29 23:26:08 +01:00
Laurent Destailleur
205b7f2e95
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-29 19:04:40 +01:00
Laurent Destailleur
3d218cadb7
FIX last_main_doc var not saved
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-01-29 19:03:45 +01:00
Laurent Destailleur
3215870ae6
FIX Exclude not required field from log
2019-01-29 19:02:34 +01:00
gauthier
3477cf6bd3
FIX : must fetch member in current entity
2019-01-29 18:01:28 +01:00
Laurent Destailleur
c6755b3cf1
Fix formatting of number in quantity field
2019-01-29 15:59:41 +01:00
Pierre Ardoin
80cfe86508
Update objectline_view.tpl.php
2019-01-29 14:26:14 +01:00
Pierre Ardoin
5ea1cf0775
Update objectline_edit.tpl.php
2019-01-29 14:25:34 +01:00
Regis Houssin
9539bea68a
FIX bad sql request
2019-01-29 12:17:51 +01:00
Regis Houssin
39b696af02
FIX multicompany compatibility
2019-01-29 12:01:40 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
...
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Pierre Ardoin
e75170137e
Correction de la filtration de l'entité
...
Corrige pour que la marge réalisée sur d'autres entités n'apparaisse pas sur celle sur laquelle l'utilisateur est connecté.
2019-01-29 11:42:44 +01:00
Pierre Ardoin
f9b8622545
Prise en charge de Multicompany
...
Correction pour éviter que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.
2019-01-29 11:33:22 +01:00
Pierre Ardoin
dd0f6b3829
Edition Ligne Travaux Supplémentaires
...
Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.
2019-01-29 11:30:14 +01:00
Pierre Ardoin
30548d977f
Prise en charge des Travaux supplémentaires
...
Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.
2019-01-29 11:19:11 +01:00
Pierre Ardoin
508fb5c9cb
Prise en charge des Travaux supplémentaires
...
Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.
2019-01-29 11:13:11 +01:00
Pierre Ardoin
eca1a2cd64
Update societe.class.php
2019-01-29 11:08:13 +01:00
Laurent Destailleur
08a181bfbf
Fix substitution of REF_CLIENT and REF_SUPPLIER
2019-01-29 11:00:17 +01:00
Laurent Destailleur
43c0a2232c
Fix massaction
2019-01-29 10:51:34 +01:00
Laurent Destailleur
f6be0f7686
Fix duplicate log when using mass action email send
2019-01-29 10:48:45 +01:00
Xebax
b24f5fda68
FIX Fix PHP warning "count(): Parameter must be an array..."
2019-01-29 08:47:46 +01:00
Laurent Destailleur
5cd60f4e26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-28 16:27:54 +01:00
Laurent Destailleur
9d1a02b0d7
Fix language
2019-01-28 16:25:37 +01:00
Laurent Destailleur
9dbf41d6b2
Fix lang format
2019-01-28 16:25:06 +01:00
Laurent Destailleur
4545c0f13a
Fix lang format of en_ZA
2019-01-28 16:25:01 +01:00
John BOTELLA
6f12cdf236
Fix travis
2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0
fix travis
2019-01-28 11:56:20 +01:00
John BOTELLA
9a666b265f
Use an other test
2019-01-28 11:53:19 +01:00
Laurent Destailleur
273c396fb9
Fix bad function
2019-01-28 02:47:03 +01:00
Laurent Destailleur
f7bcd1ef6d
Fix trans
2019-01-28 01:35:12 +01:00
Laurent Destailleur
de0a057b8a
Fix div not closed
2019-01-27 19:41:14 +01:00
Laurent Destailleur
c291450a07
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-27 18:13:28 +01:00
Laurent Destailleur
7a7fd657ed
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-27 18:13:20 +01:00
Laurent Destailleur
a78db45178
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-27 18:12:36 +01:00
Laurent Destailleur
05ba397156
Merge pull request #10421 from frederic34/patch-2
...
correct menu
2019-01-27 17:55:23 +01:00
Laurent Destailleur
3c88816bf8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c
Fix upload of module file
2019-01-27 17:40:56 +01:00
Xebax
94d3f038eb
FIX 'statut' is ignored when updating a user with the REST API.
2019-01-27 13:20:33 +01:00
tarrsalah
88da5f25d8
FIX css in the case of not showing topmenu images.
2019-01-27 13:18:50 +01:00
Frédéric FRANCE
46b6d16210
correct menu
2019-01-27 09:17:01 +01:00
Laurent Destailleur
3118e92d2b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-26 14:30:59 +01:00
Laurent Destailleur
ba87284a90
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-26 14:30:44 +01:00
Laurent Destailleur
c6fe94c455
Merge pull request #10388 from hregis/9.0_bug
...
FIX JSON.parse not needeed and missing simple quote escaping
2019-01-26 14:13:26 +01:00
Laurent Destailleur
ab6393a939
Merge pull request #10396 from Librethic/9.0-fix-inventory-create
...
FIX: wrong permission test for inventory creation
2019-01-26 14:03:03 +01:00
Laurent Destailleur
8d019a2759
Merge pull request #10409 from atm-florian/9.0
...
fix broken link into contact tpl
2019-01-26 13:52:32 +01:00
Laurent Destailleur
3f75bb694c
Fix phpcs
2019-01-26 01:31:22 +01:00
florian HENRY
822706000f
fix broken link into contact tpl
2019-01-24 18:01:40 +01:00
John BOTELLA
15e1d3b456
Fix fetch test
2019-01-24 09:40:58 +01:00
Laurent Destailleur
c95b915db3
Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0
2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914
Trans
2019-01-24 07:07:26 +01:00
John BOTELLA
624d17c96a
Fix missing no trigger arg
2019-01-23 17:32:49 +01:00
John BOTELLA
1c51716997
Fix missing trigger
2019-01-23 17:02:20 +01:00
Laurent Destailleur
278b3e0b08
Fix css
2019-01-23 15:30:54 +01:00
gauthier
84e1f92acd
FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
2019-01-23 15:16:51 +01:00
Laurent Destailleur
ad54a2b8af
Fix website edit of virtualhost
2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
jfefe
b3dfbaf38c
FIX: wrong permission test for inventory creation
2019-01-23 02:45:46 +01:00
Laurent Destailleur
bb1e7ee0a1
Fix transifex
2019-01-22 19:54:47 +01:00
Laurent Destailleur
c5686df035
Sync transifex
2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b
Sync transifex
2019-01-22 18:15:47 +01:00
Laurent Destailleur
0ae3aeff12
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 20:47:52 +01:00
Laurent Destailleur
3cf81d14e3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 20:47:44 +01:00
Laurent Destailleur
6f553db93d
Remove bad text
2019-01-21 20:47:07 +01:00
Regis Houssin
0a36a487c4
FIX remove unused option
2019-01-21 18:43:12 +01:00
Laurent Destailleur
9c3a0bb14e
Merge pull request #10382 from frederic34/patch-2
...
add missing global $conf in bonprelevement class
2019-01-21 18:03:10 +01:00
Laurent Destailleur
0df1d2e2f7
Merge pull request #10384 from atm-florian/9.0
...
fix php warning
2019-01-21 18:02:50 +01:00
Laurent Destailleur
a928f3a9d7
Update dolresource.class.php
2019-01-21 18:02:43 +01:00
Regis Houssin
406f26b9d2
FIX JSON.parse not needeed and missing simple quote escaping
2019-01-21 16:48:14 +01:00
Laurent Destailleur
0cba7e1613
FIX Hide path into exported filename
2019-01-21 14:31:27 +01:00
florian HENRY
1da29fbed3
fix php warning
2019-01-21 10:12:13 +01:00
Frédéric FRANCE
4ab19c25c8
add missing global $conf in bonprelevement class
2019-01-21 08:23:31 +01:00
Laurent Destailleur
f8b205aae3
Fix missing index
2019-01-21 05:16:23 +01:00
Laurent Destailleur
95bfecdd60
Fix missing index in migration
2019-01-21 05:03:31 +01:00
Laurent Destailleur
9c1339ae06
Fix migration with pgsql
2019-01-21 04:27:30 +01:00
Laurent Destailleur
7f8b710edc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 02:52:24 +01:00
Laurent Destailleur
57c9104f1c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-21 02:43:18 +01:00
Laurent Destailleur
5ab6c41dfa
Fix missing multicurrency fields in export
2019-01-21 02:43:08 +01:00
Laurent Destailleur
b868397902
Fix colspan
2019-01-21 02:27:13 +01:00
Laurent Destailleur
2e9e413e17
Try pgsql fix
2019-01-21 01:51:28 +01:00
Laurent Destailleur
da2ba20653
Try fix for postgresql
2019-01-20 20:31:12 +01:00
Laurent Destailleur
f7c11ec7f4
Fix unit test on accounting
2019-01-20 17:06:24 +01:00
Frédéric FRANCE
077b9f1996
get_codeclient return void
...
1ac55b0800/htdocs/societe/class/societe.class.php (L2421-L2441)
2019-01-20 15:23:48 +01:00
Laurent Destailleur
51b03e358e
Fix phpunit
2019-01-20 13:45:29 +01:00
Laurent Destailleur
616aa1f81c
Fix var not defined
2019-01-19 17:10:14 +01:00
Laurent Destailleur
4ffd7de9f7
doc
2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405
Fix hash for gol_getprefix must not contains special char.
2019-01-19 16:14:45 +01:00
Laurent Destailleur
5c825310a3
Fix bad link and css
2019-01-19 14:49:44 +01:00
Laurent Destailleur
f27f1f9d4a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-19 13:20:46 +01:00
Laurent Destailleur
55c90b0578
Fix #10359 cloning of proposal
2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
ptibogxiv
b3cbbc1b11
FIX lang for dolistore in module.php
2019-01-19 11:41:47 +01:00
wdammak
aaa61254ac
Update stats.class.php
...
Fix div/0 warnings
2019-01-19 11:36:09 +01:00
wdammak
191900d258
Update stats.class.php
...
Fix div/0 warnings
2019-01-19 11:35:16 +01:00
wdammak
13e7d18291
Update stats.class.php
...
Fix div/0 warnings
2019-01-19 11:33:56 +01:00
Laurent Destailleur
f82c917f13
Better use of email content to init project
2019-01-18 19:39:51 +01:00
Laurent Destailleur
971670da8d
Clean language file
2019-01-18 14:24:49 +01:00
ptibogxiv
1a10d8f702
FIX loadLangs in subscription list.php
...
for v9 et develop
2019-01-17 19:19:55 +01:00
Laurent Destailleur
45ea1647d0
Merge pull request #10357 from hregis/8.0_mc
...
FIX broken external authentication module feature and avoid warning
2019-01-17 19:15:40 +01:00
Laurent Destailleur
ba34709c36
Merge pull request #10347 from prietojc/patch-4
...
FIX: To add more thirdparties pdf models in custom modules
2019-01-17 19:01:38 +01:00
Laurent Destailleur
cb59c97ef7
Merge pull request #10350 from a-schild/7.0
...
Fix for issue #10333 branch 7.0
2019-01-17 18:59:52 +01:00
Laurent Destailleur
55771bdb3d
Merge pull request #10349 from a-schild/8.0
...
Fix for issue #10333 branch 8.0
2019-01-17 18:59:36 +01:00
Laurent Destailleur
16bb85b7fa
Merge pull request #10348 from a-schild/9.0
...
Fix for issue #10333 branch 9.0
2019-01-17 18:58:49 +01:00
Regis Houssin
1d33b6ccbb
FIX broken external authentication module feature and avoid warning
2019-01-17 16:01:32 +01:00
gauthier
d997309bcb
FIX : if(!method_exists(dol_loginfunction))
2019-01-17 14:49:30 +01:00
JC Prieto
5223b1ee1a
FIX: To add more pdf models in thirdparties
2019-01-16 20:23:16 +01:00
Laurent Destailleur
f8973c9a22
Fix translation Late <> Alert
2019-01-16 17:44:39 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
688311c761
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-16 16:45:38 +01:00
Laurent Destailleur
698222c769
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/adherents/subscription.php
2019-01-16 16:45:30 +01:00
Laurent Destailleur
476527e71e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4
Fix missing substitution of ID
2019-01-16 16:34:36 +01:00
Laurent Destailleur
638be67f96
Fix tooltip
2019-01-16 13:56:13 +01:00
a-schild
7e3bfd332e
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:07:00 +01:00
a-schild
7df86cb630
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:06:12 +01:00
a-schild
2f5db98a5c
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:05:22 +01:00
Laurent Destailleur
f4dd8a4e50
Update myobject_card.php
2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422
simplification
2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb
linl back to list if cancelled on create
2019-01-16 12:47:31 +01:00
atm-quentin
0d384eea00
FIX credit note can have negative value
2019-01-16 09:33:24 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
Laurent Destailleur
f51b4288da
Merge pull request #10336 from hregis/8.0_bug
...
FIX avoid php warning
2019-01-15 17:59:09 +01:00
Laurent Destailleur
adc4422323
Update card.php
2019-01-15 17:57:30 +01:00
Regis Houssin
41a38b3a0a
FIX avoid php warning
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 15:44:45 +01:00
Regis Houssin
7c9d85d091
FIX problem with multicompany transverse mode
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 12:18:04 +01:00
Laurent Destailleur
6159703116
Fix warning and date
2019-01-15 11:14:01 +01:00
Laurent Destailleur
2ec2daa18d
FIX Edit blog meta post
2019-01-15 10:53:28 +01:00
Frédéric FRANCE
cf55b54cf5
correct list of links
2019-01-14 10:02:48 +01:00
Laurent Destailleur
8c6fde72f8
Several fixes in look and feel of module survey
2019-01-13 19:36:00 +01:00
Laurent Destailleur
e0d11edb6b
FIX Sql error on filter of project preview with date
2019-01-13 14:09:40 +01:00
Laurent Destailleur
1aa2b7a164
FIX SQL injection on rowid of dict.php
2019-01-10 03:26:34 +01:00
Laurent Destailleur
057b606663
Fix tooltip
2019-01-09 15:03:44 +01:00
Laurent Destailleur
d1e062cafa
FIX When changing date of payment, change also record in bank if not
...
conciliated yet.
2019-01-09 13:28:12 +01:00
Laurent Destailleur
890abd28d5
Fix look and feel v9
2019-01-09 12:26:49 +01:00
Laurent Destailleur
61e9e8d60c
Fix missing link
2019-01-09 11:41:23 +01:00
Laurent Destailleur
0d9367b09d
Merge pull request #10305 from tuxgasy/8.0_bill_orders
...
Fix #10301 mass bill orders
2019-01-08 16:50:48 +01:00
Laurent Destailleur
a1f5ede736
Update actions_massactions.inc.php
2019-01-08 16:50:27 +01:00
Laurent Destailleur
47448b77f0
Update actions_massactions.inc.php
2019-01-08 16:47:30 +01:00
TuxGasy
2c2f86736a
Fix #10301 mass bill orders and replicate extrafields
2019-01-08 15:59:20 +01:00
diversity-co-uk
2dc87509ff
Fix Invoice PUT, remove extra parameter
...
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this
See facture.class.php 1610:
function update(User $user, $notrigger=0)
2019-01-08 14:17:33 +01:00
Laurent Destailleur
acc665a9f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-08 14:08:22 +01:00
Laurent Destailleur
6ca163c68b
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list
...
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
2019-01-08 14:06:24 +01:00
Laurent Destailleur
9a6c3ac3df
FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-08 14:05:07 +01:00
Marc de Lima Lucio
68802c659e
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
2019-01-08 11:41:58 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/core/actions_sendmails.inc.php
htdocs/filefunc.inc.php
2019-01-08 01:48:54 +01:00
Laurent Destailleur
8e3df45cbf
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/holiday/define_holiday.php
2019-01-08 01:46:03 +01:00
Laurent Destailleur
f85389ac29
Fix missing td column
2019-01-08 01:11:34 +01:00
Laurent Destailleur
41743056bf
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-08 01:09:21 +01:00
Laurent Destailleur
087a4400b0
FIX Default value on sales representative on third party creation
2019-01-08 01:05:42 +01:00
Laurent Destailleur
1188540b41
Sync transifex
2019-01-07 19:39:41 +01:00
Laurent Destailleur
8b1455f29e
FIX Cash fence
2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8
Add nb of invoice to help cash fence
2019-01-07 19:02:38 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
Xebax
fbb1b344d1
Merge remote-tracking branch 'upstream/7.0' into 7.0
2019-01-06 13:44:13 +01:00
Xebax
2c496d2ac0
FIX Civility not saved when creating a member.
2019-01-06 13:42:41 +01:00
Laurent Destailleur
38ec05f2f1
Fix search filter lost
2019-01-06 01:17:11 +01:00
Laurent Destailleur
b1559dbc39
Fix perms
2019-01-05 15:22:24 +01:00
Laurent Destailleur
c9e6074551
Code clean
2019-01-05 15:14:06 +01:00
Laurent Destailleur
59d6000e89
Code comment
2019-01-05 15:13:35 +01:00
Juanjo Menent
74442911a7
Change to 7.0.6
2019-01-05 14:45:23 +01:00
Juanjo Menent
7908550937
Merge remote-tracking branch 'upstream/7.0' into 7.0
2019-01-05 13:05:50 +01:00
ldestailleur
0ce514079b
FIX Button journalize grey when mandatroy setup not done
2019-01-05 12:51:08 +01:00
ldestailleur
e47cf24fa1
Try to fix chrome xss protection
2019-01-04 19:10:25 +01:00