Laurent Destailleur
5a659bfd90
Fix Missing currency
2019-02-05 19:57:35 +01:00
Laurent Destailleur
7c24847fa3
Typo
2019-02-05 19:38:28 +01:00
Laurent Destailleur
7436a3bc73
Typo
2019-02-05 19:37:58 +01:00
Laurent Destailleur
66998c4873
Fix translation
2019-02-05 19:37:22 +01:00
Laurent Destailleur
44f5223c90
Remove warning
2019-02-05 18:54:38 +01:00
Laurent Destailleur
bb315a6f12
Fix trans
2019-02-05 16:44:10 +01:00
Laurent Destailleur
4097d648ae
Fix search with alias
2019-02-05 15:23:51 +01:00
Laurent Destailleur
b7f2a2b3f3
Fix search alias page if page not found
2019-02-05 15:15:41 +01:00
Laurent Destailleur
fbed22050d
fix syntax error
2019-02-05 14:33:36 +01:00
Laurent Destailleur
4de122d1d4
Fix date format
2019-02-05 14:33:03 +01:00
Laurent Destailleur
e3d0cb1637
Fix css
2019-02-05 14:32:23 +01:00
Laurent Destailleur
541f6e537e
Fix link to pay membership renewal
2019-02-05 14:05:39 +01:00
Laurent Destailleur
e5827f77cb
Fix link to pay membership renewal
2019-02-05 14:03:35 +01:00
Laurent Destailleur
6d09c85231
Fix missing button
2019-02-05 14:01:32 +01:00
Laurent Destailleur
b58c49d0bb
Trans
2019-02-05 13:59:23 +01:00
Laurent Destailleur
8d40440418
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-05 13:57:08 +01:00
Laurent Destailleur
d6501d996c
Missing trans
2019-02-05 13:56:55 +01:00
Marc de Lima Lucio
428efa9227
FIX: line edit template: keep fk_parent_line
2019-02-05 12:02:49 +01:00
Marc de Lima Lucio
64739098ae
FIX: expedition: reset status on rollback + replace hardcoded status with const
2019-02-05 11:58:49 +01:00
atm-quentin
da0c863f45
FIX supplier invoice payment total dont care about deposit or credit
2019-02-05 10:30:38 +01:00
atm-quentin
730a2a90ff
FIX supplier invoice product stats total ht is line total not invoice total
2019-02-05 09:43:14 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Regis Houssin
4a19cba257
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-05 06:34:05 +01:00
Laurent Destailleur
bb8b3d4e5c
Add br
2019-02-05 00:25:42 +01:00
Laurent Destailleur
efe5cd3dd8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 21:13:06 +01:00
Laurent Destailleur
cdfeeafab9
FIX #10381
2019-02-03 21:12:05 +01:00
Laurent Destailleur
72f78ecf3b
FIX #10460 compatibility with MariaDB 10.4
2019-02-03 20:02:05 +01:00
Laurent Destailleur
a520642d97
FIX Price in combo list of service does not use the correct price level
2019-02-03 19:54:55 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
4538d13add
Merge pull request #10450 from atm-gauthier/8.0_fIX_fetch_member
...
FIX : wrong tests on fetch
2019-02-03 19:25:25 +01:00
Laurent Destailleur
bd2c7092a4
Update user.class.php
2019-02-03 19:25:11 +01:00
Laurent Destailleur
62d677118d
Update adherent.class.php
2019-02-03 19:24:18 +01:00
Frédéric FRANCE
9c41f41c24
add missing require date.lib.php
2019-02-03 19:06:20 +01:00
Laurent Destailleur
f8b10e9c3d
Doxygen
2019-02-03 18:47:55 +01:00
Laurent Destailleur
456e78b7cf
FIX #10485
2019-02-03 17:45:31 +01:00
Maxime Kohlhaas
bb3225809b
Fix warehouse fetch was not checking parameters. Fixes #10414
2019-02-02 18:43:25 +01:00
Laurent Destailleur
75845a990f
FIX Missing province in export of invoice
2019-02-01 22:55:28 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Laurent Destailleur
c313ad6195
Fix phpcs
2019-02-01 18:19:39 +01:00
Laurent Destailleur
a2ab6348ed
Fix bad menu leading on a development page
2019-02-01 17:06:34 +01:00
Laurent Destailleur
b83ff06db8
FIX #10416 No need of another option
2019-02-01 17:00:04 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Laurent Destailleur
e366ab551c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-02-01 16:01:26 +01:00
Laurent Destailleur
dee2a373c1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2019-02-01 16:01:18 +01:00
Laurent Destailleur
dbf7ae4c25
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-02-01 15:56:58 +01:00
Laurent Destailleur
452dfafd32
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-02-01 15:56:47 +01:00
Laurent Destailleur
bff2f33022
Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch
...
Fix fetch test
2019-02-01 15:56:26 +01:00
Laurent Destailleur
dbab955cbd
Merge pull request #10471 from mapiolca/patch-9
...
#Fix : Error in Total Products/Services
2019-02-01 15:43:47 +01:00
Laurent Destailleur
f00271fee6
Merge pull request #10467 from atm-gauthier/7.0_fix_nextnumref
...
FIX : need an order by in case we found other invoice with same number but not same date
2019-02-01 15:38:16 +01:00
Laurent Destailleur
ae81bbac93
Better var name
2019-02-01 13:49:07 +01:00
Laurent Destailleur
b14a16a119
Code comment
2019-02-01 13:48:09 +01:00
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
Günter Lukas
1cf786acff
Fix #10278
...
Fix #10278
2019-01-22 00:09:36 +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
ATM-Nicolas
2a7b3c7d7d
FIX : Check for old picture name if the new one was not found
2019-01-14 10:48:34 +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
ldestailleur
89f24f6fe8
Fix cache not working on css files
2019-01-04 18:58:36 +01:00
ldestailleur
3485d0b4e5
Fix regression when editing html source
2019-01-04 18:39:02 +01:00
ldestailleur
3b6d6eec9a
Fix cach on image for website
2019-01-04 18:06:54 +01:00
ldestailleur
2c474de61e
FIX Update of timespent when date is empty
2019-01-04 15:44:39 +01:00
ldestailleur
5638ac8f4d
FIX title on picto no more visible
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-01-04 15:25:14 +01:00
Ferran Marcet
f3dd875fc7
FIX: Can't generate invoice pdf
2019-01-04 12:00:39 +01:00
Ferran Marcet
4694af0488
FIX: Can't generate invoice pdf
2019-01-04 11:45:02 +01:00
Ferran Marcet
3e358c90b3
Merge branch '7.0up' into 7.0
2019-01-04 11:32:19 +01:00
Ferran Marcet
15cc45b8ae
FIX: Can't generate invoice pdf
2019-01-04 10:52:10 +01:00
ldestailleur
082b126c06
FIX Can't switch page when html editing without save or cancel
2019-01-03 22:39:51 +01:00
ldestailleur
1ae11c554b
Fix regression if style
2019-01-03 21:35:25 +01:00
ldestailleur
cf84fdf7c7
Translate option "Simplify interface for blind persons"
2019-01-03 20:07:58 +01:00
ldestailleur
1b19f5153b
Fix cash fence feature
2019-01-03 14:18:02 +01:00
ldestailleur
7c1ed5b913
FIX #9972 #10297
2019-01-03 13:28:35 +01:00
Josep Lluís
60d3cced37
FIX: delete all contact categories
...
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.
Conflicts:
htdocs/contact/card.php
2019-01-03 13:00:06 +01:00
ldestailleur
aaf5408f08
Fix user/pass not mandatory
2019-01-03 12:57:03 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +01:00
ldestailleur
ff582a38e1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-03 11:12:27 +01:00
ldestailleur
5f9bbbcdd7
Fix migration
2019-01-03 11:12:14 +01:00
Laurent Destailleur
fad9a0cf32
Merge pull request #10287 from aspangaro/9.0_p3
...
Small fix
2019-01-02 20:02:05 +01:00
Laurent Destailleur
8b380489f2
Update commonobject.class.php
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-01-02 19:55:51 +01:00
Laurent Destailleur
c690b92410
Merge pull request #10277 from aspangaro/9.0_accountancy_html
...
FIX : #10221 Html codes in accounting export
2019-01-02 19:52:18 +01:00
Laurent Destailleur
752b73cb0d
Merge pull request #10276 from aspangaro/9.0_accountancy
...
FIX: Generation of FEC:CompteLib
2019-01-02 19:51:57 +01:00
Laurent Destailleur
1202bb3173
Merge pull request #10274 from fmarcet/8.0
...
FIX: Loan impossible to account
2019-01-02 19:50:46 +01:00
Laurent Destailleur
a39336c80d
Simple join is better than RIGHT JOIN
2019-01-02 19:50:23 +01:00
ldestailleur
a9e8e13bb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/user/param_ihm.php
2019-01-02 19:41:39 +01:00
ldestailleur
d8d47763aa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-02 19:39:42 +01:00
ldestailleur
3d8479291d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-02 19:39:35 +01:00
JC Prieto
99e2f893fd
Fix: loadBatchInfo()
2019-01-02 19:38:44 +01:00
ldestailleur
8645a7f524
FIX Interface regression for bind people. Fix option
...
MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-02 18:58:45 +01:00
Frédéric FRANCE
cad95c7dc2
Update societe.class.php
2019-01-02 15:39:22 +01:00
gauthier
fc3da0f5be
FIX : holidays get natural_search if search params are set only
2019-01-02 10:02:30 +01:00
Alexandre SPANGARO
c4dbf41530
Look & feel
2018-12-30 21:21:40 +01:00
Alexandre SPANGARO
a2075b9d2c
V9 look & Feel, etc
2018-12-30 20:32:44 +01:00
Alexandre SPANGARO
cbcf097ec1
FIX : #10221 Html codes in accounting export
2018-12-29 23:20:30 +01:00
Alexandre SPANGARO
3eb5b06472
FIX: Generation of FEC:CompteLib
2018-12-29 22:26:06 +01:00
Juanjo Menent
cf64053fa5
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-12-29 15:07:09 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302
FIX sql error when resetting payment mode / term
2018-12-29 07:48:47 +01:00
ldestailleur
7b91c14cb3
FIX sql error when resetting payment mode / term
2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31
FIX Can set payment mode to empty on thirdparty page
2018-12-28 23:14:36 +01:00
Ferran Marcet
dc93cccbe1
FIX: Loan impossible to account
2018-12-28 12:57:04 +01:00
Laurent Destailleur
713d71bd95
Fix menu
2018-12-28 12:51:54 +01:00
Laurent Destailleur
e0f94bbb59
Add role=navigation
2018-12-28 12:50:23 +01:00
Laurent Destailleur
3cd91d7c66
Fix look and feel v9 (autofocus)
2018-12-28 00:41:05 +01:00
Laurent Destailleur
9842f50942
Fix substitution for members
2018-12-27 21:16:33 +01:00
Laurent Destailleur
cd53e22d64
FIX Edit description of event
2018-12-27 06:16:54 +01:00
Laurent Destailleur
64de31ef67
Clean log
2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8
FIX Bad trigger name
2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0
Add log
2018-12-27 06:08:48 +01:00
Laurent Destailleur
2b0240a1e2
Add log
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-12-27 06:08:24 +01:00
Laurent Destailleur
294107bba0
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:07:11 +01:00
Laurent Destailleur
0f76279a03
FIX Missing token and style
2018-12-27 03:46:14 +01:00
Laurent Destailleur
63beb50465
Fix missing migration of external site module
2018-12-26 21:22:12 +01:00
Laurent Destailleur
e7b3c91645
Fix dump file
2018-12-26 19:10:22 +01:00
Laurent Destailleur
7b61fc8fd1
Fix setup of dav module
2018-12-23 14:03:19 +01:00
Laurent Destailleur
6557dcfb81
CSS
2018-12-23 00:49:26 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
94ee18a20a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2018-12-22 18:59:49 +01:00
Laurent Destailleur
b3b7a12a16
FIX Look and feel v9
2018-12-22 18:56:29 +01:00
Laurent Destailleur
0646d4ab7a
Merge pull request #10262 from hregis/8.0_mc
...
FIX check if "entity" is already defined in "$param"
2018-12-22 18:25:00 +01:00
Laurent Destailleur
f8b0e535fa
Code comment
2018-12-22 17:30:22 +01:00
Laurent Destailleur
2b088a73c1
FIX CVE-2018-19998
2018-12-22 17:16:08 +01:00
Laurent Destailleur
bacd5110fb
FIX CVE-2018-19995 and CVE-2018-19998
2018-12-22 17:12:38 +01:00
Laurent Destailleur
850b939ffd
FIX CVE-2018-19994
2018-12-22 17:03:50 +01:00
Laurent Destailleur
fc3fcc5455
FIX CVE-2018-19993
2018-12-22 16:59:30 +01:00
Laurent Destailleur
0f06e39d23
FIX CVE-2018-19992
2018-12-22 16:55:31 +01:00
Laurent Destailleur
33564ddafc
Fix css
2018-12-22 16:45:57 +01:00
Regis Houssin
09ce84ca93
FIX avoid Class 'AdherentType' not found
2018-12-21 16:38:02 +01:00
Laurent Destailleur
4859d944d8
Sync transifex
2018-12-21 12:09:03 +01:00
Regis Houssin
9b215e117a
FIX check if "entity" is already defined in "$param"
2018-12-21 11:23:44 +01:00
Laurent Destailleur
391f916bd5
Fix trans
2018-12-21 10:21:56 +01:00
Laurent Destailleur
d9b8a8c8ae
Debug cash fence feature
2018-12-19 16:12:55 +01:00
Laurent Destailleur
b0652494b5
Debug cash fence
2018-12-19 15:40:01 +01:00
Laurent Destailleur
ed13f7b729
Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price
...
FIX : Function updatePrice with wrong parameters
2018-12-19 13:02:00 +01:00
Laurent Destailleur
2978522006
Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change
...
FIX: contact/address tab issue when changing company
2018-12-19 12:59:32 +01:00
Laurent Destailleur
707af49025
FIX Missing last month on vat report per month
2018-12-19 12:07:26 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b7f373802
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
2018-12-18 21:35:30 +01:00
Laurent Destailleur
4b6ae9d424
FIX Error reported when creation of thirdparty from member fails
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
2018-12-18 21:32:41 +01:00
Laurent Destailleur
b8429c607e
FIX Can't create a thirdparty from member if customer code is mandatory.
2018-12-18 21:29:53 +01:00
Laurent Destailleur
6851232314
Fix removing constant no more required
2018-12-18 21:29:36 +01:00
Laurent Destailleur
f2318716ec
FIX Error reported when creation of thirdparty from member fails
2018-12-18 21:27:16 +01:00
Laurent Destailleur
31d032d5d3
FIX Can't create a thirdparty from member if customer code is mandatory.
2018-12-18 21:00:06 +01:00
Laurent Destailleur
2e6a41228f
Fix removing constant no more required
2018-12-18 20:49:48 +01:00
Laurent Destailleur
2d2b95a082
Fix calculation of top menu entry of user
2018-12-18 17:01:57 +01:00
ATM-Nicolas
96144e18f1
FIX : Function updatePrice with wrong parameters
2018-12-18 15:27:32 +01:00
Laurent Destailleur
90e87fc4d9
Fix cache
2018-12-18 15:15:33 +01:00
Laurent Destailleur
57c41bac56
Fix parameter session_cache_limiter
2018-12-18 15:07:32 +01:00
Laurent Destailleur
c3eb131054
Debug ticket module
2018-12-18 13:30:22 +01:00
Laurent Destailleur
16496218d3
css
2018-12-18 13:21:00 +01:00
Laurent Destailleur
dcdfe5c318
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-18 11:03:35 +01:00
Laurent Destailleur
3ae03d619d
Fix tooltip
2018-12-18 11:03:23 +01:00
Marc de Lima Lucio
7e2eca661b
FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account
2018-12-18 09:40:58 +01:00
Laurent Destailleur
4a22640ae9
Merge pull request #10240 from aspangaro/9.0_agiris
...
FIX: Accountancy - Missing information on Agiris Export
2018-12-17 21:10:05 +01:00
Laurent Destailleur
48162db33d
FIX Rename of image file lose the thumbs
2018-12-17 20:19:11 +01:00
Laurent Destailleur
c444ef3b4d
FIX wrapper could not download shared files
2018-12-17 19:37:17 +01:00
Laurent Destailleur
1faaed504a
Fix param attachment
2018-12-17 18:48:41 +01:00
Laurent Destailleur
ffaff4dc7f
Debug website module
2018-12-17 17:29:04 +01:00
atm-ph
1aadcc50f1
Fix attached files from user mail form don't work
2018-12-17 15:48:27 +01:00
Laurent Destailleur
4e940ebaf1
FIX Download of files with hashp when files are into user dir
2018-12-17 15:35:20 +01:00
Laurent Destailleur
17b2fd295f
FIX Css of amount on remain to pay on expense report
2018-12-17 13:57:30 +01:00
Laurent Destailleur
6b5c0d1ea1
Save cash fence event into unalterable log
2018-12-17 11:41:59 +01:00
Laurent Destailleur
1979e3238c
Fix rounding
2018-12-17 10:42:30 +01:00
Laurent Destailleur
e06b06c788
Work on cash fence
2018-12-17 10:37:56 +01:00
Alexandre SPANGARO
f728b28a67
FIX: Missing information on Agiris Export
2018-12-17 06:02:29 +01:00
Laurent Destailleur
cbb5e3bbe9
Better translation
2018-12-17 03:31:20 +01:00
Laurent Destailleur
bf9ee18bed
Standardize code.
2018-12-17 03:25:45 +01:00
Laurent Destailleur
af4405c669
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf
Remove white lines
2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd
Clean code
2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4
FIX Can't delete a line of minimal stock per warehouse
2018-12-16 19:23:53 +01:00
Laurent Destailleur
20d24f2feb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-16 18:45:30 +01:00
Laurent Destailleur
2d05b7c790
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-16 18:45:13 +01:00
Laurent Destailleur
9b844df315
FIX Extrafields on shipment module
2018-12-16 18:44:58 +01:00
Laurent Destailleur
72c5943c55
Execute trigger so we can record line into unalterable log table
2018-12-16 17:53:23 +01:00
Laurent Destailleur
ce2d67f225
Fix phpcs
2018-12-16 17:45:51 +01:00
Laurent Destailleur
9558020ea3
Merge pull request #10233 from simnandez/8.0
...
FIX: Vendor translations are in english
2018-12-16 17:40:37 +01:00
Laurent Destailleur
e5e4ef7b8c
Work on cash fence
2018-12-16 16:47:09 +01:00
Laurent Destailleur
e366d7d57c
Work on cash fence
2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Laurent Destailleur
e14b426985
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/exports/export.php
2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a
FIX CVE-2018-19799
2018-12-16 13:36:51 +01:00
Laurent Destailleur
699766223f
Fix phpcs
2018-12-16 13:00:24 +01:00
Juanjo Menent
a61677dcc6
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-12-16 11:31:06 +01:00
Juanjo Menent
6ce0d3e279
FIX: Vendor translations are in english
2018-12-16 11:16:12 +01:00
Alexandre SPANGARO
6eb9013430
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
2018-12-16 06:36:55 +01:00
Alexandre SPANGARO
8148ea8361
Revert "Fix: Problem with loan integration in general ledger"
...
This reverts commit 50da3c2ed2 .
2018-12-16 06:16:14 +01:00
Alexandre SPANGARO
df8aaf9c06
Merge branch '9.0' of https://github.com/Dolibarr/dolibarr into 9.0
2018-12-16 06:14:55 +01:00
Alexandre SPANGARO
50da3c2ed2
Fix: Problem with loan integration in general ledger
2018-12-16 06:14:33 +01:00
Laurent Destailleur
a601859985
Work on cash fence
2018-12-15 19:58:43 +01:00
Laurent Destailleur
2bfc5fe235
Work on cash fence
2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47
Work on cash fence feature
2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b
Work on legal cash fence
2018-12-15 19:20:30 +01:00
Laurent Destailleur
8ce6f67773
Fix phpcs
2018-12-15 18:27:38 +01:00
Laurent Destailleur
944f9ac894
Typo
2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
33a91ff707
Add missing POS closure feature
2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766
First CashControl version
2018-12-15 16:45:36 +01:00
Norbert Penel
0f3a063c91
Events are not linked to products
...
when created from a product card, the events are not linked to the product
2018-12-15 15:57:15 +01:00
Laurent Destailleur
db46d82de3
Fix position of menu entries
2018-12-15 15:35:59 +01:00
Laurent Destailleur
6846d8821d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2018-12-15 14:07:25 +01:00
Laurent Destailleur
2a3b808da6
CSS
2018-12-15 14:05:23 +01:00
Laurent Destailleur
e069da69ba
Revert "Fix screen size fall"
...
This reverts commit abb6b41f91 .
2018-12-15 12:35:37 +01:00
Laurent Destailleur
dbe5d285e8
Merge pull request #9965 from atm-john/fix_responsive
...
FIX screen size fall
2018-12-15 12:33:35 +01:00
Laurent Destailleur
063e589a1b
Merge branch '8.0' into 8.0_fix9964
2018-12-14 19:37:40 +01:00
Laurent Destailleur
45115a9590
Merge pull request #10191 from fappels/7.0_fix_issue#10186
...
Fix issue #10186 no display of stock per batch series.
2018-12-14 19:34:11 +01:00
Laurent Destailleur
ea35e45f76
Merge pull request #10197 from atm-maxime/fix_import_bank
...
Fix unexistant fields
2018-12-14 17:40:45 +01:00
Laurent Destailleur
abd09ae631
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-14 17:24:17 +01:00
PMickael
37daface19
[Accounting][VAT] Fix balance should be based on period
...
[Accounting][VAT] Fix balance should be based on period
2018-12-14 17:23:45 +01:00
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Laurent Destailleur
5dabefe227
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-13 20:49:55 +01:00
Laurent Destailleur
dcb43214d6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196
FIX #10183 using backport of fix done in 9.0
2018-12-13 20:45:51 +01:00
Laurent Destailleur
603656c7de
Merge pull request #10219 from simnandez/8.0
...
FIX : #10218 Bad redirection after deleting a user or group
2018-12-13 20:02:53 +01:00
Laurent Destailleur
4413b2e886
Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0
...
FIX if qty is 0
2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php
2018-12-13 19:56:22 +01:00
florian HENRY
2e57a8be51
better fix
2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964
2018-12-13 12:34:39 +01:00
Laurent Destailleur
b0941967f0
Fix sort of email templates
2018-12-13 12:13:28 +01:00
Laurent Destailleur
0ecdb0f3bb
Code comment
2018-12-12 13:02:18 +01:00
Laurent Destailleur
61503bdaa9
Fix picto for status of cron task
2018-12-12 13:02:11 +01:00
Laurent Destailleur
ad3c679d28
Fix status in cron task list
2018-12-12 13:02:03 +01:00
Juanjo Menent
22c34bd656
Fix: MenuBankCash Translation is in english in es_ES
2018-12-12 12:09:07 +01:00
Laurent Destailleur
13f5476678
Responsive
2018-12-12 11:50:10 +01:00
Laurent Destailleur
98c14efa78
Fix missing picto
2018-12-11 14:10:20 +01:00
Laurent Destailleur
250725663d
FIX Missing generic css
2018-12-11 13:48:12 +01:00
Juanjo Menent
d1eed14488
FIX : #10218 Bad redirection after deleting a user or group
2018-12-11 13:25:33 +01:00
Laurent Destailleur
4a61c1b6ed
FIX lang not loaded
2018-12-11 13:25:09 +01:00
Laurent Destailleur
4aff0b6471
Fix opensurvey
2018-12-11 10:52:59 +01:00
Laurent Destailleur
a107d16338
Revert "clean and update code"
...
This reverts commit 68de0ba93b .
2018-12-11 09:52:00 +01:00
Laurent Destailleur
3c8aa38bf7
Fix use iframe to embed content
2018-12-10 19:06:34 +01:00
Laurent Destailleur
e2a575e547
Fix use of external url in iframes
2018-12-10 18:44:45 +01:00
Laurent Destailleur
bdb4295379
Fix menu editor
2018-12-10 18:24:05 +01:00
Laurent Destailleur
6105bb2bb6
Fix: difference between text and url into external web site module
2018-12-10 18:10:57 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
atm-quentin
3da9650003
FIX if qty is 0
2018-12-10 16:06:11 +01:00
Laurent Destailleur
f3a67d6c3f
FIX Show warning when trying to create task on closed project
2018-12-10 15:06:54 +01:00
Laurent Destailleur
853566cc28
Fix bold chars in tooltips
2018-12-10 14:40:42 +01:00
Laurent Destailleur
e2e22f95d1
FIX Workaround for flex bug
2018-12-10 13:18:34 +01:00
Laurent Destailleur
dbee87aa9d
Trans
2018-12-10 13:10:28 +01:00
Laurent Destailleur
af5b63954a
Clean code
2018-12-10 12:49:20 +01:00
Laurent Destailleur
188cda7902
Fix look and feel v9
2018-12-10 12:32:26 +01:00
Laurent Destailleur
3f912ebfff
FIX restore security event login/logout
2018-12-10 11:19:52 +01:00
Laurent Destailleur
42d4cf9992
Fix sql
2018-12-10 10:17:54 +01:00
Laurent Destailleur
cf74e5b9a8
Change order of tabs
2018-12-10 00:25:10 +01:00
Laurent Destailleur
91b190506b
Fix bad path
2018-12-10 00:19:46 +01:00
Laurent Destailleur
bbcb2aa983
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-10 00:15:54 +01:00
Laurent Destailleur
ff8f235b7e
Fix regression when disabling table
2018-12-10 00:15:22 +01:00
Laurent Destailleur
ac48996bd3
FIX Look and feel v8
2018-12-09 23:41:59 +01:00
Laurent Destailleur
be7e424862
FIX thirdparty not set on some events
2018-12-09 00:16:59 +01:00
Laurent Destailleur
25f66bd024
Code comment
2018-12-08 14:44:52 +01:00
Laurent Destailleur
b43c2ce839
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:52:12 +01:00
Laurent Destailleur
930312b425
FIX Migration do not create not used table
2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35
FIX Can relaunch install on v8
2018-12-08 11:51:01 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
eaa7fe5d14
Removed deprecated code
2018-12-08 11:41:55 +01:00
Laurent Destailleur
d2f0c87d8f
FIX Removed not use table
2018-12-08 11:41:08 +01:00
Laurent Destailleur
a44dca7e71
Removed deprecated table
2018-12-08 11:37:47 +01:00
Laurent Destailleur
d0a1c523ca
FIX several critical bugs in migration of directory of users
2018-12-07 19:53:02 +01:00
Laurent Destailleur
3538e9ab3b
Fix migration
2018-12-07 19:05:24 +01:00
Laurent Destailleur
37fe8afea3
Code comment
2018-12-07 14:54:40 +01:00
Laurent Destailleur
f755457236
Test imap available
2018-12-07 14:54:25 +01:00
Laurent Destailleur
d3a6b16021
FIX Show declared progress
2018-12-07 14:54:09 +01:00
Laurent Destailleur
572366c6c2
FIX status of user
2018-12-07 14:54:02 +01:00
Laurent Destailleur
65d492efed
Minor fix
2018-12-07 14:53:49 +01:00
Maxime Kohlhaas
550df138a6
Fix unexistant fields
2018-12-07 12:19:50 +01:00
Juanjo Menent
531cfe791d
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-12-07 11:34:42 +01:00
fappels
e2727f6d91
Fix issue #10186 no display of stock per batch series.
2018-12-06 21:43:10 +01:00
Laurent Destailleur
163cac5349
Trans lead
2018-12-06 20:25:22 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +01:00
Laurent Destailleur
f142238817
Fix missing field canvas
2018-12-04 21:25:59 +01:00
Philippe GRAND
e9e6d8b9b5
Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato>
2018-12-04 16:10:56 +01:00
Laurent Destailleur
b359afd084
Prepare 9.0
2018-12-04 16:08:36 +01:00
Laurent Destailleur
bdc4893aad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-04 14:58:26 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb
Standardize code
2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Laurent Destailleur
779d33cf02
Merge pull request #10085 from fmarcet/7.0
...
FIX Lines are not inserted correctly if VAT have code
2018-12-04 13:55:57 +01:00
Laurent Destailleur
d2e8aeb8c1
Merge pull request #10173 from hregis/develop_upgrade
...
FIX wrong path, multidir_output[] for each entity is construct by the multicompany module
2018-12-04 13:39:05 +01:00
Laurent Destailleur
c27c322457
Merge pull request #10172 from hregis/develop_virtualmin
...
FIX possibility to force install lock with GET/POST or script
2018-12-04 13:38:23 +01:00
Laurent Destailleur
a87978eca4
Merge pull request #10168 from AurelGDN/develop
...
Fix: Apply andreubisquerra's fix to cheque payment
2018-12-04 13:35:42 +01:00
Laurent Destailleur
b67ed87103
Merge pull request #10166 from atm-maxime/fix_pdf_footer
...
Fix pdf footer height for all documents
2018-12-04 13:35:11 +01:00
Laurent Destailleur
1d9c0f6b77
Fix look and feel
2018-12-04 13:26:19 +01:00
Laurent Destailleur
d9bb39970f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/barcode.php
2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:15:32 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Laurent Destailleur
4a873917ce
Fix import
2018-12-04 12:40:36 +01:00
Regis Houssin
aa3e520725
FIX wrong path, multidir_output[] for each entity is construct by the
...
multicompany module
2018-12-04 09:12:36 +01:00
Regis Houssin
dcbb7c49fc
FIX wrong value for instal lock
2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1
FIX possibility to force install lock with GET/POST or script
2018-12-03 13:12:42 +01:00
Ferran Marcet
602986ced8
Merge remote-tracking branch 'origin/7.0' into 7.0
...
# Conflicts:
# htdocs/comm/propal/class/propal.class.php
# htdocs/commande/class/commande.class.php
# htdocs/expensereport/class/expensereport.class.php
# htdocs/fourn/class/fournisseur.commande.class.php
2018-12-03 12:33:18 +01:00
Ferran Marcet
7247b14bd9
FIX Lines are not inserted correctly if VAT have code
2018-12-03 12:28:17 +01:00
Ferran Marcet
135a94dfed
Merge branch '7.0up' into 7.0
2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16
FIX Lines are not inserted correctly if VAT have code
2018-12-03 11:58:39 +01:00
aurelien goudeneche
1f089d3ee2
Update pay.php
2018-12-03 09:37:45 +01:00
aurelien goudeneche
41ee56c9e9
Apply andreubisquerra's fix to cheque payment
...
Apply andreubisquerra's fix (#10147 ) to cheque payment button
2018-12-03 09:30:47 +01:00
Maxime Kohlhaas
8fea6338e1
Fix #6565
...
Fix pdf footer height for all documents
2018-12-02 18:51:49 +01:00
Maxime Kohlhaas
42c97cf7d5
Fix #6610
2018-12-02 17:59:11 +01:00
Laurent Destailleur
7c46ace042
Merge pull request #10153 from atm-maxime/fix_user_photo
...
Fix user photo path
2018-12-02 17:07:14 +01:00
Laurent Destailleur
07425e4e19
Merge pull request #10156 from grandoc/7.0_bug
...
FIX #3234
2018-12-02 17:06:06 +01:00
Laurent Destailleur
70f29d9d79
Merge pull request #10155 from frederic34/patch-2
...
GETPOSTISSET has only one param
2018-12-02 17:04:55 +01:00
Laurent Destailleur
7b1aec1e2a
Merge pull request #10157 from frederic34/memberdoc
...
doc comment adherent class
2018-12-02 17:04:30 +01:00
Laurent Destailleur
168f374ff5
Merge pull request #10159 from defrance/patch-136
...
Warning error if $conf->browser->layout is empty
2018-12-02 17:03:34 +01:00
Laurent Destailleur
ea119a26c7
Update ajax.lib.php
2018-12-02 17:03:11 +01:00
Juanjo Menent
4b785b22f6
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-12-02 15:53:14 +01:00
Juanjo Menent
aa2ecd4b73
Merge pull request #10162 from aljawaid/aljawaid-ecm_translations
...
FIX: Add Missing Translation Strings into ecm.lang
2018-12-02 15:51:40 +01:00
IJ
30f1925177
FIX: Add Missing Translation Strings into ecm.lang
...
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
2018-12-02 12:29:52 +00:00
BENKE Charlene
044c54da94
Warning error if $conf->browser->layout is empty
2018-12-02 10:45:37 +01:00
Frédéric FRANCE
3b31354dc2
cats may be int or array
2018-12-02 10:33:23 +01:00
Frédéric FRANCE
ab02cb3cde
doc comment adherent class
2018-12-02 10:12:40 +01:00
Philippe GRAND
8ec2bac36a
FIX #3234
2018-12-02 10:02:05 +01:00
Frédéric FRANCE
d2d623b0b6
GETPOSTISSET has only one param
2018-12-02 09:26:24 +01:00
Maxime Kohlhaas
ad05b531e7
Fix display user photo with new path
2018-12-02 00:02:43 +01:00
Maxime Kohlhaas
72225f6524
Migration of user photo paths
2018-12-01 23:57:15 +01:00
Maxime Kohlhaas
09b967bb1b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo
2018-12-01 23:39:28 +01:00
Laurent Destailleur
070b1d04c9
Merge pull request #10151 from frederic34/patch-17
...
fix doc comment fournisseur.facture.class.php
2018-12-01 23:06:02 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9
...
add log in empty catch
2018-12-01 23:04:41 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php
2018-12-01 22:49:12 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch
2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php
2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php
2018-12-01 21:41:40 +01:00
Laurent Destailleur
96741290ba
Merge pull request #10147 from andreubisquerra/master
...
Fix issues on TakePOS
2018-12-01 20:25:45 +01:00
andreubisquerra
8f1a00bbf1
Fix issues on TakePOS
2018-12-01 19:55:35 +01:00
Laurent Destailleur
c3e2f73e48
FIX #10144
2018-12-01 19:45:30 +01:00
Maxime Kohlhaas
5e2f3a53c9
Fix expense report in ecm auto dir
2018-12-01 19:39:00 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
Laurent Destailleur
a49a083629
Merge pull request #10142 from atm-maxime/fix_import_fk_dept
...
Fix add missing fk_department and fk_pays in contact/bank imports
2018-12-01 17:14:27 +01:00
Laurent Destailleur
0fb95c91a4
Merge pull request #10141 from andreubisquerra/master
...
TakeBOX now is 'TakePOS Connector'
2018-12-01 17:14:01 +01:00
Laurent Destailleur
e30bee50a2
Merge pull request #10139 from atm-john/fix_#8741
...
FIX #8741
2018-12-01 17:12:55 +01:00
Maxime Kohlhaas
13806124b2
Fix add missing fk_department and fk_pays in contact/bank imports
2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis
2018-12-01 17:10:06 +01:00
andreubisquerra
1009588592
TakeBOX now is 'TakePOS Connector'
2018-12-01 17:09:21 +01:00
ATM John BOTELLA
474228cbd6
FIX #8741
2018-12-01 17:01:11 +01:00
Juanjo Menent
642a86ba25
Fix #8152
2018-12-01 16:55:45 +01:00
Maxime Kohlhaas
8c13c87429
Fix path for user photo
2018-12-01 16:55:42 +01:00
florian HENRY
6236f727c9
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964
2018-12-01 16:51:51 +01:00
florian HENRY
c422904b99
fix #9964
2018-12-01 16:51:40 +01:00
Inovea Conseil
18281d9d43
FIX #6580
...
FIX #6580
2018-12-01 16:48:50 +01:00
Laurent Destailleur
e4bc9f8f87
Merge pull request #10136 from grandoc/8.0
...
fix :#9967
2018-12-01 16:45:37 +01:00
Maxime Kohlhaas
748dd12e4d
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model
...
FIX : Select first mail model by default
2018-12-01 16:39:22 +01:00
Philippe GRAND
bbf3b3baac
fix :#9967
2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999
2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c
fix #9999
2018-12-01 16:23:40 +01:00
Frédéric FRANCE
61322b9ce2
devcamp 2018 fix #9642
2018-12-01 16:19:54 +01:00
BENKE Charlene
1dc2fc5060
fix #9475
2018-12-01 16:17:52 +01:00
Laurent Destailleur
a8009d4a72
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources
...
FIX Work with new table actioncomm_resources and multiple contact affectation
2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76
Update company.lib.php
2018-12-01 16:15:34 +01:00
Inovea Conseil
0ba5fda3da
Update price.php
2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572
...
Fix #9572
2018-12-01 15:58:37 +01:00
Juanjo Menent
7d4553179d
Fix #9929
2018-12-01 15:48:46 +01:00
Laurent Destailleur
6076976e3b
Merge pull request #10128 from grandoc/new_branch_01_12_2018
...
fix scrutinizer issue : The variable seems only to be defined at a l…
2018-12-01 15:48:38 +01:00
Philippe GRAND
3df83d7cf3
fix scrutinizer issue : The variable seems only to be defined at a later point
2018-12-01 15:45:02 +01:00
Laurent Destailleur
5c755b6f9f
Merge pull request #10095 from ptibogxiv/patch-97
...
Fix duration display product/service in list.php
2018-12-01 15:14:57 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2
...
Avoid adding libs not compatible with php 5.4
2018-12-01 15:09:25 +01:00
Laurent Destailleur
5d3575ab4d
Merge pull request #10126 from atm-florian/develop
...
fix scrutinizer
2018-12-01 15:08:45 +01:00
Laurent Destailleur
03f0922325
Merge pull request #10087 from AurelGDN/develop
...
New Takepos: cheque payment button in cashdesk
2018-12-01 15:03:19 +01:00
Laurent Destailleur
305ab85f5d
Merge pull request #10114 from frederic34/patch-17
...
Update 6.0.0-7.0.0.sql #8723
2018-12-01 14:54:31 +01:00
Laurent Destailleur
358be875e4
Merge pull request #10120 from defrance/patch-127
...
scrutinizer major error
2018-12-01 14:49:50 +01:00
Laurent Destailleur
b8e3aaa3cb
Merge pull request #10121 from defrance/patch-128
...
scrutinizer major error
2018-12-01 14:49:28 +01:00
Laurent Destailleur
915b1b9528
Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer
...
Fix issue from scrutinizer
2018-12-01 14:49:14 +01:00
florian HENRY
8e38d24121
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2018-12-01 14:43:32 +01:00
florian HENRY
47eda86e2f
fix scrutinizer
2018-12-01 14:39:04 +01:00
Laurent Destailleur
30ed180dd4
Merge pull request #10122 from defrance/patch-129
...
scrutinizer major error correction
2018-12-01 14:29:42 +01:00
ATM John BOTELLA
c6f4879575
Fix issue from scrutinizer
2018-12-01 12:04:34 +01:00
BENKE Charlene
676ac67817
scrutinizer error update
2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff
scrutinizer major error correction
...
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
2018-12-01 11:44:46 +01:00
Frédéric FRANCE
07da468109
Update modDav.class.php
2018-12-01 11:39:58 +01:00
BENKE Charlene
fca332995b
scrutinizer major error
2018-12-01 11:37:50 +01:00
BENKE Charlene
c34b213f61
scrutinizer major error
2018-12-01 11:33:58 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract
...
Fix pdf strato for contract with multipage
2018-12-01 11:14:38 +01:00
Juanjo Menent
1c04c2b5f4
Fix #10097
2018-12-01 10:38:40 +01:00
Maxime Kohlhaas
2b5bf0e2dd
Fix pdf strato for contract with multipage
2018-12-01 01:07:15 +01:00
florian HENRY
38059ed60d
fix #10006
2018-12-01 00:39:37 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql
2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql
2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql
2018-12-01 00:26:51 +01:00
Juanjo Menent
0e1c4d92da
Merge pull request #10112 from inoveaconseil/patch-2
...
Fix missing translation
2018-11-30 23:59:29 +01:00
Juanjo Menent
d1df592c7e
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen
...
Fix #9074
2018-11-30 23:57:49 +01:00
Juanjo Menent
859d6c4401
Merge pull request #10109 from atm-maxime/fix_dupl_code
...
Fix #9070
2018-11-30 23:57:32 +01:00
Juanjo Menent
a57a43fc05
Merge pull request #10104 from inoveaconseil/MassClose
...
FIX mass action closed proposal
2018-11-30 23:56:38 +01:00
Juanjo Menent
70d75caf09
Merge pull request #10096 from ptibogxiv/patch-98
...
Fix trans
2018-11-30 23:54:36 +01:00
Inovea Conseil
6201962dcf
Fix missing translation
2018-11-30 23:27:05 +01:00
florian HENRY
7a182c7880
fix #10069
2018-11-30 23:25:44 +01:00
Maxime Kohlhaas
e8a02a971d
Fix #9074
2018-11-30 23:05:12 +01:00
Maxime Kohlhaas
7585461486
Fix #9070
2018-11-30 22:16:17 +01:00
Maxime Kohlhaas
5dcb3d2a1f
Fix extrafields in import tool
2018-11-30 19:23:05 +01:00
Laurent Destailleur
2dc6351593
Fix website import
2018-11-30 15:16:17 +01:00
Inovea Conseil
ad7117be60
FIX mass action closed proposal
2018-11-30 15:05:28 +01:00
Laurent Destailleur
7a4c1cddc8
Fix save master file of a website
2018-11-30 14:46:44 +01:00
Laurent Destailleur
e8d29c644b
Fix grab web site
2018-11-30 14:30:00 +01:00
Laurent Destailleur
94c2d7194c
Trans Website
2018-11-30 12:41:35 +01:00
Laurent Destailleur
4260d5765f
Fix bad trans key
2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a
Update ChangeLog
2018-11-30 11:00:42 +01:00
ptibogxiv
e8bdb580ab
Fix trans
2018-11-29 14:00:27 +01:00
ptibogxiv
310dc46113
Update list.php
2018-11-29 13:44:42 +01:00
ptibogxiv
31e3b82ca6
Fix duration display product/service in list.php
2018-11-29 13:44:10 +01:00
Laurent Destailleur
539d993666
Fix translation of month
2018-11-29 12:20:47 +01:00
Laurent Destailleur
bbfd134733
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3
...
FIX remove constant for avoid problem
2018-11-29 11:18:29 +01:00
Laurent Destailleur
d5c28a76d8
Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type
...
FIX: Display All Types of Payments on Expense Report Card
2018-11-29 11:17:31 +01:00
Laurent Destailleur
b15403207b
Merge pull request #10077 from aspangaro/9.0p1
...
Fix create accounting account from balance
2018-11-29 11:16:27 +01:00
Laurent Destailleur
950dfeef58
Merge pull request #10081 from oscim/patch-1
...
Update company.lib.php
2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d
Update company.lib.php
2018-11-29 11:15:27 +01:00
Laurent Destailleur
163bc3784e
Merge pull request #10076 from ptibogxiv/patch-96
...
Fix retrieve Donation newpayment.php
2018-11-29 11:14:33 +01:00
Laurent Destailleur
9e20d9e847
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Laurent Destailleur
6e21b372d1
Merge pull request #10094 from defrance/patch-125
...
Duplicate declaration of $object
2018-11-29 10:58:36 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Laurent Destailleur
a460452101
Merge pull request #10086 from bafbes/abb80044
...
fix: Access to global $conf needed
2018-11-29 10:57:21 +01:00
Laurent Destailleur
05f1e5f16b
Merge pull request #10089 from grandoc/new_branch_28_11_2018
...
FIX: bad URL
2018-11-29 10:57:08 +01:00
Laurent Destailleur
2808876904
Merge pull request #10084 from grandoc/new_branch_27_11_2018
...
fix : typo error
2018-11-29 10:56:53 +01:00
BENKE Charlene
10bf7bdc95
Duplicate declaration of $object
...
Already present line 126
2018-11-29 10:29:04 +01:00
Laurent Destailleur
c5bd11951f
Fix bar not visible on some screen
2018-11-29 02:09:07 +01:00
Laurent Destailleur
bfc2f6e84c
Add template
2018-11-29 00:48:47 +01:00
Laurent Destailleur
af2150a427
CSS
2018-11-29 00:45:15 +01:00
Laurent Destailleur
3c0ff40e43
Fix trans
2018-11-29 00:41:12 +01:00
Laurent Destailleur
619ec1f0cb
Fix trans
2018-11-29 00:40:18 +01:00
Laurent Destailleur
3650543749
CSS
2018-11-28 22:51:24 +01:00
Laurent Destailleur
23126fe49a
CSS
2018-11-28 17:14:13 +01:00
Regis Houssin
b4aa9ee335
FIX remove constant for avoid problem
2018-11-28 17:04:42 +01:00
Laurent Destailleur
ca1f9c7e60
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/sendings.lang
htdocs/langs/es_ES/stocks.lang
2018-11-28 16:57:39 +01:00
Laurent Destailleur
b9c08853be
CSS
2018-11-28 16:54:21 +01:00
Philippe GRAND
2b6810e2ab
FIX: bad URL
2018-11-28 16:37:49 +01:00
Laurent Destailleur
28902e18ee
Fix for screen with antiblue system
2018-11-28 16:32:53 +01:00
ptibogxiv
21f4d474b4
Fix sql don.class.php
2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd
FIX Method setValid not found
2018-11-28 16:11:00 +01:00
Marc de Lima Lucio
c13cc5d697
FIX: form actions: select_type_actions could be too small + bad init
2018-11-28 15:46:27 +01:00
Laurent Destailleur
3b66a2bf9c
Fix missing email in popup
2018-11-28 14:20:55 +01:00
AurelienGoudeneche
4282a46bb2
Add files via upload
...
revert previous comment l44
2018-11-28 13:20:44 +01:00
Laurent Destailleur
dbef8fc380
FIX Add field for data becoming mandatory by some online payment system
2018-11-28 13:13:38 +01:00
Laurent Destailleur
01181ba3a4
Fix avoid warning
2018-11-28 13:06:39 +01:00
AurelienGoudeneche
2edaa0e1d9
Add files via upload
2018-11-28 13:05:59 +01:00
AurelienGoudeneche
4d9e64bfcf
Add files via upload
2018-11-28 13:04:59 +01:00
Laurent Destailleur
d59c81cfe4
Fix missing or
2018-11-28 11:47:24 +01:00
Juanjo Menent
2f61d29b06
FIX : #10080 Supplier translations are in english
2018-11-28 10:40:45 +01:00
Laurent Destailleur
436a85ef7a
Fix missing email
2018-11-27 20:34:43 +01:00
Abbes Bahfir
1a8882198e
fix: Accss to global $conf needed
2018-11-27 18:22:12 +01:00
Laurent Destailleur
a4fc564048
css
2018-11-27 18:04:45 +01:00
Laurent Destailleur
780a538fe0
Fix multicompany not accessible from website.
2018-11-27 17:37:39 +01:00
Laurent Destailleur
bb565d33f9
FIX Several fixes in fetchAll
2018-11-27 16:39:08 +01:00
Laurent Destailleur
0b6aaccfcc
sync transifex
2018-11-27 16:35:47 +01:00
Laurent Destailleur
70bd931d08
FIX empty page due to preg_replace JIT error on large strings
2018-11-27 16:20:31 +01:00
Ferran Marcet
9d6c95e8a9
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-11-27 11:39:07 +01:00
Ferran Marcet
d8537a3c76
FIX Lines are not inserted correctly if VAT have code
2018-11-27 11:36:31 +01:00
Laurent Destailleur
e95c6091c4
Fix lang
2018-11-27 11:10:39 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Laurent Destailleur
71bcabd8eb
Missing trans
2018-11-27 10:23:58 +01:00
Philippe GRAND
30d30d9c1e
fix : typo error
2018-11-27 10:06:38 +01:00
Laurent Destailleur
7c22504252
Fix position of field must be ssame between create/edit/view
2018-11-27 09:22:59 +01:00
Laurent Destailleur
b9e544d291
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
Laurent Destailleur
b5c136bc32
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-26 23:02:23 +01:00
Laurent Destailleur
653b99cb33
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-26 23:02:07 +01:00
Laurent Destailleur
84d73086ea
Fix bookkeeping list was empty
2018-11-26 22:53:56 +01:00
Laurent Destailleur
2f2df12f59
Complete dictionary
2018-11-26 18:02:25 +01:00
Philippe GRAND
a59a4c60e0
FIX : Typo errors
2018-11-26 16:09:05 +01:00
Philippe GRAND
52f587e1e3
merging
2018-11-26 16:05:53 +01:00
oscim
f5ebcca475
error space after comment
2018-11-26 15:47:51 +01:00
Laurent Destailleur
12b9ac2c3b
Fix lang
2018-11-26 14:48:27 +01:00
Laurent Destailleur
62e39f5a31
Fix title
2018-11-26 14:37:19 +01:00
Philippe GRAND
8722ccef82
fix typo error
2018-11-26 14:35:29 +01:00
Philippe GRAND
05d617b759
fix typo error
2018-11-26 14:33:45 +01:00
Philippe GRAND
9bf0f12068
fix typo error
2018-11-26 14:32:04 +01:00
Philippe GRAND
3800fde225
fix typo error
2018-11-26 14:29:25 +01:00
Laurent Destailleur
f0ab6e60ec
FIX Loading translation of cron tasks
2018-11-26 13:31:05 +01:00
Laurent Destailleur
8f15fe9c63
Empty lines
2018-11-26 12:41:10 +01:00
Laurent Destailleur
611569f639
Add missing translation
2018-11-26 11:18:01 +01:00
oscim
2af24903e9
Update company.lib.php
...
Fix list in agenda for tab customer / provider , no thirdparty selected because name of class is not Societe
2018-11-26 10:53:34 +01:00
IJ
db719dbcbb
FIX: Display All Types of Payments on Expense Report Card
...
Fixes #9991 - Bug: 7.0.4: Expense Report Payment Type Not Displayed
- without this fix, only cash type accounts were shown when payment was made
2018-11-25 20:36:25 +00:00
Laurent Destailleur
4bb8568d6c
Fix doxygen
2018-11-25 12:18:45 +01:00
Laurent Destailleur
a395e9e4ee
Fix var not defined
2018-11-25 12:13:35 +01:00
Laurent Destailleur
2e139d1960
Fix var $hidedetails not defined
2018-11-25 12:08:49 +01:00
Laurent Destailleur
ed1062c440
Css
2018-11-25 11:59:49 +01:00
Laurent Destailleur
1d2c2a23ef
Fix look and feel v8
2018-11-25 11:57:19 +01:00
Alexandre SPANGARO
9154fd366f
Fix create accounting account from balance
2018-11-24 22:30:06 +01:00
ptibogxiv
d401974028
Fix retrieve Donation newpayment.php
2018-11-24 15:33:48 +01:00
Laurent Destailleur
099f47deba
Merge pull request #10019 from frederic34/swiftmailer
...
Swiftmailer
2018-11-24 11:54:47 +01:00
Laurent Destailleur
82b4b3ccb3
Merge pull request #10047 from frederic34/patch-9
...
doc cmail class
2018-11-24 11:20:49 +01:00
Laurent Destailleur
2fcd221dbb
Merge pull request #10048 from frederic34/patch-15
...
Update fournisseur.commande.class.php
2018-11-24 11:20:21 +01:00
Laurent Destailleur
ecb6ea9151
Merge pull request #10058 from frederic34/patch-2
...
correct link and avoid warning in resource list
2018-11-24 11:17:56 +01:00
Laurent Destailleur
f0e4c262a3
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card
...
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
2018-11-24 11:13:49 +01:00
Laurent Destailleur
ff857c0144
Merge pull request #10064 from frederic34/pdfexpensereport
...
try to fix the expensereport pdf
2018-11-24 11:11:26 +01:00
Laurent Destailleur
1398b94a80
Merge pull request #10062 from ptibogxiv/patch-94
...
Fix sql don.class.php
2018-11-24 11:08:39 +01:00
Laurent Destailleur
0cc4ee2b01
Merge pull request #10073 from ptibogxiv/patch-95
...
Fix order&co billed on online payment page
2018-11-24 11:08:26 +01:00
Laurent Destailleur
b5d1a34080
Update newpayment.php
2018-11-24 11:08:05 +01:00
Laurent Destailleur
c1efb2d423
Merge pull request #10070 from frederic34/patch-17
...
doc comment accountancycategory class
2018-11-24 11:06:32 +01:00
Laurent Destailleur
333efbeadf
Merge pull request #10061 from andreubisquerra/master
...
Cash drawer button
2018-11-24 11:05:55 +01:00
Laurent Destailleur
13e24dc894
Code comment
2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
9f610c2279
Add website template
2018-11-23 12:46:32 +01:00
ptibogxiv
e8ba8814cd
Update newpayment.php
2018-11-23 12:45:37 +01:00
ptibogxiv
6a232a8754
Update newpayment.php
2018-11-23 12:27:24 +01:00
ptibogxiv
1cc6763950
Fix order billed online payment
2018-11-23 11:40:38 +01:00
Laurent Destailleur
ea7c77d788
Trans
2018-11-23 11:09:27 +01:00
Laurent Destailleur
a06b032c23
fix trans
2018-11-23 10:53:04 +01:00
fappels
322ce410d7
Add missing paid field in fetch sql
2018-11-23 09:42:43 +01:00
Frédéric FRANCE
d21abc2dc3
Update accountancycategory.class.php
2018-11-22 23:26:04 +01:00
Frédéric FRANCE
295d082da1
Update accountancycategory.class.php
2018-11-22 22:56:38 +01:00
Frédéric FRANCE
21b429836a
doc comment accountancycategory class
2018-11-22 21:08:03 +01:00
Laurent Destailleur
0a057c8277
Clean var_dump
2018-11-22 20:47:53 +01:00
Laurent Destailleur
fe35e72e83
Fix perf. Make only one request per group for year N-1.
2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910
Prepare code for performance enhancement
2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3
Optimize performance: Remove call for year N, can be done with total of
...
each month
2018-11-22 19:45:35 +01:00
Laurent Destailleur
97af22369d
Trans
2018-11-22 13:47:55 +01:00
Laurent Destailleur
3bb7726101
Revert "Fix translation"
...
This reverts commit 8de30c12d8 .
2018-11-22 13:22:05 +01:00
Laurent Destailleur
8de30c12d8
Fix translation
2018-11-22 13:19:25 +01:00
Laurent Destailleur
0fbf213739
Fix length of field
2018-11-22 13:08:18 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Thibault Descamps
d63d8088ed
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card
2018-11-22 11:37:25 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Laurent Destailleur
784c13d9d0
Fix label of month
2018-11-22 11:14:05 +01:00
Laurent Destailleur
89138bc349
FIX Accounting personalized report when using multicompany
2018-11-22 10:59:39 +01:00
Laurent Destailleur
21e9c02b11
Performance enhancement in Accounting Personalized report
2018-11-22 10:40:15 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf
2018-11-21 23:06:52 +01:00
ptibogxiv
fe30eee16e
Fix sql don.class.php
2018-11-21 19:50:55 +01:00
andreubisquerra
463aff4540
Cash drawer button
2018-11-21 16:54:40 +01:00
Laurent Destailleur
5e9abe6aad
Fix getLanguageCodeFromCountryCode
2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +01:00
Laurent Destailleur
93929a652b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-21 15:35:15 +01:00
Laurent Destailleur
084516b885
Fix ip detection of geoip
2018-11-21 15:11:57 +01:00
Frédéric FRANCE
e8cac0df35
correct link and avoid warning in resource list
2018-11-21 14:06:06 +01:00
Laurent Destailleur
0ea6f2778b
Fix examples
2018-11-20 22:01:38 +01:00
Laurent Destailleur
6514b51382
Better help
2018-11-20 21:59:05 +01:00
Laurent Destailleur
c891f6ed10
Disable javascript feature with no javascript
2018-11-20 21:26:22 +01:00
Laurent Destailleur
1ecdaa548c
Remove the no more used and deprecated dol_print_graph function
2018-11-20 20:28:46 +01:00
Laurent Destailleur
966a0b7ec7
Fix message content and language
2018-11-20 20:13:16 +01:00
Laurent Destailleur
07fe7e58d8
Code comment
2018-11-20 19:04:58 +01:00
Laurent Destailleur
61fddadc3f
Complete the fetchAll of modulebuilder + websitepage
2018-11-20 18:29:29 +01:00
Laurent Destailleur
200de22807
Missing image in container
2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef
FIX Some modules templates were visible when it should not
2018-11-20 16:22:16 +01:00
Laurent Destailleur
12a6709ebe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-20 15:27:16 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Laurent Destailleur
7587eedd7c
Merge pull request #10044 from prietojc/patch-1
...
# Fix: Missing lines to search total_ttc
2018-11-20 13:44:08 +01:00
Laurent Destailleur
7e735e222e
Merge pull request #10045 from frederic34/patch-2
...
GETPOSTISSET has only one parameter
2018-11-20 13:43:41 +01:00
Laurent Destailleur
8ecd5ffa3b
FIX Missing button cancel
2018-11-20 13:41:38 +01:00
Laurent Destailleur
be4dc40dfa
Fix standardize date format for payment between customer and supplier
2018-11-20 10:16:54 +01:00
Laurent Destailleur
4845e90d95
Fix update of hours for payment
2018-11-20 10:03:38 +01:00
Laurent Destailleur
4bf5a12f35
Fix trans
2018-11-20 09:56:03 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php
2018-11-19 23:56:20 +01:00
Frédéric FRANCE
4e60e48f34
Update CMailFile.class.php
2018-11-19 23:43:58 +01:00
Frédéric FRANCE
2179e2011e
doc cmail class
2018-11-19 23:38:07 +01:00
Laurent Destailleur
e020597ba7
Fix deletion for class build with modulebuilder
2018-11-19 21:11:26 +01:00
Frédéric FRANCE
8f17ae8df5
GETPOSTISSET has only one parameter
2018-11-19 20:28:55 +01:00
Laurent Destailleur
62a5869db4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 20:08:14 +01:00
Laurent Destailleur
39621ec686
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-19 20:05:32 +01:00
Laurent Destailleur
20dbbaf5cc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-19 20:05:04 +01:00
Laurent Destailleur
fb6aa01207
FIX #10030 better german chart
2018-11-19 20:04:31 +01:00
JC Prieto
deff4ca4a0
Update list.php
...
Missing the following lines to search total_ttc
2018-11-19 20:03:36 +01:00
Laurent Destailleur
839428d545
Missing trans
2018-11-19 19:02:00 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view
...
FIX hidden extrafield
2018-11-19 18:37:18 +01:00
Laurent Destailleur
929635d468
Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter
...
Fix Contact Agenda events filter when no Third Party
2018-11-19 18:35:55 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124
...
Add societe extrafields on proposal export
2018-11-19 18:33:41 +01:00
Laurent Destailleur
8535844737
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param
...
Fix new params has been added not optional
2018-11-19 18:26:21 +01:00
Laurent Destailleur
e2269796e2
Merge branch 'develop' into swiftmailer
2018-11-19 18:23:55 +01:00
Laurent Destailleur
bd8856b988
Merge pull request #10033 from frederic34/patch-9
...
Update CMailFile.class.php
2018-11-19 18:20:20 +01:00
Laurent Destailleur
7a3f088fcb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-11-19 18:18:43 +01:00
Laurent Destailleur
c0dac69116
Merge pull request #10031 from aspangaro/9.0_style
...
Fix Page Salaries stats - Look & feel v9
2018-11-19 18:14:35 +01:00
Laurent Destailleur
4bedeabc5b
FIX #10036
2018-11-19 18:02:29 +01:00
Laurent Destailleur
1b09179df7
Merge pull request #10035 from frederic34/patch-15
...
typo
2018-11-19 17:44:20 +01:00
Laurent Destailleur
828f79bbd5
Merge pull request #10023 from hregis/develop_bug2
...
FIX more simple
2018-11-19 17:44:05 +01:00
gauthier
ecdfa5219b
FIX : We want to be able to send PDF of paid invoices
2018-11-19 17:31:45 +01:00
Laurent Destailleur
8d4db1d085
Fix phpcs
2018-11-19 16:35:37 +01:00
Laurent Destailleur
77ed591648
Fix phpcs
2018-11-19 16:05:27 +01:00
Laurent Destailleur
2f87ee6640
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 15:56:38 +01:00
Laurent Destailleur
2d09008610
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-19 15:55:59 +01:00
Laurent Destailleur
f85ab8d0a6
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Laurent Destailleur
8a5add6a98
Fix phpcs
2018-11-19 15:53:09 +01:00
Laurent Destailleur
50e20b2ac0
Fix phpcs
2018-11-19 15:52:46 +01:00
Laurent Destailleur
a3398f1a8d
Sync transifex
2018-11-19 15:49:58 +01:00
atm-ph
129034ba76
Fix new params has been added not optional
2018-11-19 15:46:30 +01:00
Laurent Destailleur
ade0363224
Module status
2018-11-19 15:46:20 +01:00
Laurent Destailleur
2947dcfc8d
Sanitize message
2018-11-19 15:36:12 +01:00
Laurent Destailleur
5f93315097
Clean code
2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64
FIX Link between action and project must use field not the link table
2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export
2018-11-19 12:17:41 +01:00
florian HENRY
dc2f1e9812
fix list agenda extrafield visibility
2018-11-19 11:25:48 +01:00
Laurent Destailleur
824b1924e2
Fix loading of cronjob
2018-11-19 10:33:42 +01:00
Laurent Destailleur
2480a8dc2a
Ignore
2018-11-18 15:57:20 +01:00
Laurent Destailleur
22b2af6911
Exclude dir
2018-11-18 15:46:37 +01:00
Laurent Destailleur
a179d45afd
Remove deprecated translation keys
2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23
Trans
2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1
Sync transifex
2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Frédéric FRANCE
0ba388de5d
typo
2018-11-17 18:03:59 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php
2018-11-17 11:33:01 +01:00
Alexandre SPANGARO
4e39065e29
Fix Page Salaries stats - Look & feel v9
2018-11-17 07:37:32 +01:00
Laurent Destailleur
a2c9fefee0
Fix do not show tool to check european vat if country is not in EEC
2018-11-17 00:40:39 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
028be21070
Debug
2018-11-16 16:55:53 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
Laurent Destailleur
3b193a8a7b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-16 14:13:18 +01:00
Laurent Destailleur
f32706259a
Sync transifex
2018-11-16 14:13:00 +01:00
François J
a5777d30e1
Fix Contact Agenda events filter when no Third Party
...
Handle case where the contact is not linked to any third party.
2018-11-16 10:09:25 +01:00
Frédéric FRANCE
532ce34c53
i put the sword under the carpet
2018-11-15 21:36:20 +01:00
Frédéric FRANCE
7c241620c0
replace random_bytes
2018-11-15 21:20:09 +01:00
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code
2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code
2018-11-15 20:32:51 +01:00
Laurent Destailleur
6d640ab83c
Fix feature to drag and drop rows of table (not generic)
2018-11-15 19:58:06 +01:00
Regis Houssin
ffc9b02322
FIX missing one column
2018-11-15 18:28:12 +01:00
Regis Houssin
38b4b719f0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2
2018-11-15 18:27:50 +01:00
Regis Houssin
03acd7a40c
FIX travis error again
2018-11-15 18:24:32 +01:00
Laurent Destailleur
e58dd3c0b1
Merge pull request #10024 from hregis/develop_bug
...
FIX travis errors
2018-11-15 18:21:25 +01:00
Laurent Destailleur
7d5c9959bc
Close #9978
...
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Regis Houssin
531b6e8d2b
FIX travis errors
2018-11-15 18:13:07 +01:00
Laurent Destailleur
103dfe2aa7
FIX go back to create form if error
2018-11-15 17:55:27 +01:00
Regis Houssin
2d2e836965
FIX more simple
2018-11-15 17:45:33 +01:00
Laurent Destailleur
b51004e809
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c
FIX xss injection on user address
2018-11-15 17:34:11 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
6297e03ea9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-15 17:16:12 +01:00
Laurent Destailleur
4fa694569e
Merge pull request #10018 from Tetras-Libre/develop
...
Fix issue #9956 User can edit some of their data without permissons
2018-11-15 16:56:57 +01:00
Laurent Destailleur
8a97ba4ba9
Update card.php
2018-11-15 16:56:12 +01:00
Laurent Destailleur
ff0a5d9fe1
Merge pull request #10016 from WSoptics/wsoptics-8.0
...
FIX: sql errors
2018-11-15 16:47:52 +01:00
Laurent Destailleur
6ffd63c965
Update projectstats.class.php
2018-11-15 16:47:40 +01:00
Laurent Destailleur
f2bbb54b8f
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
...
FIX : filter on product category doesn't work
2018-11-15 16:44:40 +01:00
Laurent Destailleur
f3228dc4f8
Merge pull request #10010 from atm-john/Fix_cat_photo_upload
...
Fix event message on upload category picture fail
2018-11-15 16:43:59 +01:00
Laurent Destailleur
d20bb41cde
Merge pull request #10017 from hregis/8.0_bug
...
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-15 16:43:00 +01:00
Laurent Destailleur
b0d1174600
Merge pull request #10020 from mwelters/develop
...
for Denmark: forme_jurisdisque additions
2018-11-15 16:39:32 +01:00
Laurent Destailleur
8bfcbc8f9d
Merge pull request #10015 from frederic34/patch-9
...
doc bookkeeping class
2018-11-15 16:28:42 +01:00
Laurent Destailleur
f2fba05475
Merge branch 'develop' into new_branch_13_11_2018
2018-11-15 16:23:54 +01:00
Laurent Destailleur
c04fcf170b
Work on emailcollector
2018-11-15 16:23:07 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
markus
ac0f46f9e5
for Denmark: forme_jurisdisque additions
2018-11-15 11:10:54 +01:00
Laurent Destailleur
3ca45e0e40
Fix double dot in sql filename
2018-11-15 10:59:55 +01:00
Regis Houssin
6f90516f57
FIX check write permission for multicurrency
2018-11-15 09:40:08 +01:00
Frédéric FRANCE
92cda2a75c
fix cant use method return value
2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f
correctly check intl extension
2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3
replace specific php7 code
2018-11-14 22:05:21 +01:00
Laurent Destailleur
e94b545cb6
Fix field not required
2018-11-14 18:38:09 +01:00
David Beniamine
01947288fb
Fix issue #9956 User can edit some of their data without permissons
2018-11-14 18:29:15 +01:00
Regis Houssin
bcc83408e0
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b
FIX missing GETPOST('entity')
2018-11-14 17:34:27 +01:00
Regis Houssin
0907a6d611
FIX wrong object name (travis error)
2018-11-14 16:55:14 +01:00
Regis Houssin
0592e8a31c
FIX config is override by multicompany module
2018-11-14 16:44:10 +01:00
Regis Houssin
874e27ef84
FIX multicompany override constants of current entity
2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4
FIX new method: override constants of current entity
2018-11-14 15:34:39 +01:00
Regis Houssin
2bc25fc008
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-14 15:24:41 +01:00
Regis Houssin
9ff4b31843
FIX compatibility with invoice sharing and invoice number sharing
2018-11-14 15:24:22 +01:00
Regis Houssin
3294fada3d
FIX working on invoice sharing (multicompany)
2018-11-14 14:59:36 +01:00
Laurent Destailleur
1f6ccd4a66
Fix permission to edit websites
2018-11-14 13:58:00 +01:00
Laurent Destailleur
a7989eb893
Fix menu
2018-11-14 13:55:10 +01:00
Laurent Destailleur
df2aa2e2f6
Fix column balance
2018-11-14 13:52:43 +01:00
Laurent Destailleur
ba22ae45e7
Fix column balance
2018-11-14 13:45:20 +01:00
Laurent Destailleur
0201939ebe
Fix column balance
2018-11-14 13:43:39 +01:00
Laurent Destailleur
7aa042172e
Fix sql error
2018-11-14 13:06:40 +01:00
Frédéric FRANCE
4909e3afc4
doc bookkeeping class
2018-11-14 08:28:20 +01:00
Regis Houssin
04edcaa89c
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-13 20:20:46 +01:00
gauthier
85dd0ec2dd
FIX : filter on product category doesn't work
2018-11-13 15:24:53 +01:00
John BOTELLA
c6cf748ba7
Fix envent message on upload category picture
2018-11-13 14:44:10 +01:00
Laurent Destailleur
77582b2a41
FIX the autofocus feature
2018-11-13 11:36:57 +01:00
John BOTELLA
500bb7bc96
best conditions testing
2018-11-13 10:20:34 +01:00
Philippe GRAND
2ed060a070
fix: Invalid argument supplied for foreach()
2018-11-13 10:07:04 +01:00
Philippe GRAND
35c43683b6
fix Erreur DB_ERROR_SYNTAX
2018-11-13 09:45:47 +01:00
Laurent Destailleur
723654efea
Fix phpcs
2018-11-12 17:15:03 +01:00
Laurent Destailleur
628918f863
Remove var_dump
2018-11-12 16:43:33 +01:00
Tobias Elbert
fceaae7a8d
fixed sql query error
2018-11-12 16:22:42 +01:00
Tobias Elbert
ceae6ac376
fixed sql query error
2018-11-12 16:21:20 +01:00
gauthier
f404cae546
FIX : Same on customer card
2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87
FIX : fourn payment modes musn't be available on customer docs
2018-11-12 15:58:41 +01:00
Laurent Destailleur
01e7b5747d
FIX user param is null not 0 when not defined
...
FIX properties email_xx were not set
2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72
FIX filter on entity must be done as soon as we don't search on rowid.
2018-11-12 14:49:08 +01:00
François J
10dd5652ee
Add SELECT DISTINCT to show_actions_done() SQL request
2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4
Join llx_actioncomm_resources only if we have a contact object.
2018-11-12 12:20:07 +01:00
tarrsalah
5eb897e049
FIX sql query performance on list_qualified_avoir_supplier_invoices.
2018-11-12 12:11:40 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889
Merge pull request #9994 from ptibogxiv/patch-91
...
Fix Invalid argument supplied for foreach()
2018-11-11 17:30:06 +01:00
Laurent Destailleur
cda88f4df9
Merge pull request #9993 from ptibogxiv/patch-90
...
Fix Invalid argument supplied for foreach()
2018-11-11 17:29:32 +01:00
Laurent Destailleur
4f7d3e794a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47
FIX #9992
2018-11-11 17:28:17 +01:00
Laurent Destailleur
65d8f59321
Merge pull request #9992 from delcroip/patch-18
...
to support proposal_supplier insert
2018-11-11 17:27:23 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql
2018-11-11 17:27:16 +01:00
Laurent Destailleur
f39b99b153
Merge pull request #9933 from ptibogxiv/patch-83
...
Update Stripe Version API
2018-11-11 17:25:49 +01:00
Laurent Destailleur
35419fa206
Dolibarize code
2018-11-11 15:06:08 +01:00
Laurent Destailleur
0b57faa7b4
Fix help
2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6
Code comment
2018-11-11 14:36:35 +01:00
Laurent Destailleur
ad7ae76cd3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-10 15:51:49 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach()
2018-11-10 15:04:38 +01:00
Laurent Destailleur
6591cdba75
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-10 15:03:34 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach()
2018-11-10 15:02:50 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert
...
proposal_supplier has 17 char when the elementtype column can take only 16 char
2018-11-10 14:59:46 +01:00
Laurent Destailleur
ed3a333436
Fix phpcs
2018-11-10 13:11:18 +01:00
Laurent Destailleur
776d5e6fc6
Merge pull request #9988 from frederic34/patch-15
...
The variable $i seems to be never defined.
2018-11-10 12:20:09 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug
...
FIX missing field "visible"
2018-11-10 12:19:35 +01:00
Laurent Destailleur
2946ca60cf
Merge pull request #9989 from frederic34/patch-16
...
Update actions_ticket.class.php
2018-11-10 12:18:37 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim
...
add admin dkim translation
2018-11-10 12:16:43 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9
...
remove warning
2018-11-10 12:16:10 +01:00
ptibogxiv
20a3dd86cd
2018-11-08
...
no change for dolibarr but better for integration and development
2018-11-10 11:07:01 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php
2018-11-10 07:55:01 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php
2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php
2018-11-10 07:32:22 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined.
2018-11-10 07:27:20 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Frédéric FRANCE
172468587d
Update mymodulewidget1.php
2018-11-09 18:13:13 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation
2018-11-09 18:08:06 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Frédéric FRANCE
1fd398234f
remove warning
2018-11-09 15:29:49 +01:00
Laurent Destailleur
773e2da4cc
Fix example of number for holiday
2018-11-09 11:41:27 +01:00
Regis Houssin
ee06f36f4c
FIX missing field "visible"
2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966
FIX missing action "edit" for the hook
2018-11-09 10:32:08 +01:00
Laurent Destailleur
f1193ad3dd
FIX: Missing date creation and modification of supplier price
2018-11-09 10:29:22 +01:00
Laurent Destailleur
4946de9533
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/setup/codesniffer/ruleset.xml
2018-11-09 01:32:47 +01:00
Laurent Destailleur
9d15f83f4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/stats/index.php
2018-11-08 20:19:28 +01:00
Laurent Destailleur
8a89da25c6
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/margin/tabs/thirdpartyMargins.php
2018-11-08 20:18:13 +01:00
Laurent Destailleur
400b48bd9b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-08 20:14:40 +01:00
Laurent Destailleur
1b8649be6f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-08 20:14:02 +01:00
Laurent Destailleur
d6bd325f70
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid
...
FIX supplier order list keep socid
2018-11-08 20:13:52 +01:00
Laurent Destailleur
b26867c027
Merge pull request #9977 from ptibogxiv/patch-89
...
FIX API for document download
2018-11-08 20:09:08 +01:00
Laurent Destailleur
4ced94f5fd
Merge pull request #9974 from frederic34/previewimage
...
can click on image to preview in doc list
2018-11-08 20:06:38 +01:00
Laurent Destailleur
9a31a61c9d
FIX #9971
2018-11-08 20:05:01 +01:00
Laurent Destailleur
f919e6ddb0
Merge pull request #9971 from atm-gauthier/FIX_langs_projet
...
FIX : OppStatusShort doesn't exists
2018-11-08 20:00:49 +01:00
Laurent Destailleur
76ac3bd457
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-08 19:57:42 +01:00
Laurent Destailleur
be788e6167
FIX responsive
2018-11-08 19:57:31 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town
...
New Search Contact by Town
2018-11-08 19:55:51 +01:00
Laurent Destailleur
50bd8bc4ce
Merge pull request #9969 from grandoc/new_branch_07_11_2018
...
fix : missing translation
2018-11-08 19:55:25 +01:00
Laurent Destailleur
7430a35533
Merge pull request #9966 from madx666/contrib
...
Fix public ticket website
2018-11-08 19:54:36 +01:00
Laurent Destailleur
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign
...
FIX marge sign
2018-11-08 19:37:52 +01:00
Laurent Destailleur
01baddb096
Merge pull request #9959 from hregis/8.0_bug
...
FIX export only prices of the current entity !
2018-11-08 19:26:09 +01:00
Laurent Destailleur
d1aabf9566
Merge pull request #9976 from atm-john/fix_warning
...
FIX Warning: count()
2018-11-08 19:25:32 +01:00
Laurent Destailleur
b6ffca01d2
Merge pull request #9973 from AXeL-dev/patch-2
...
remove useless line of code
2018-11-08 19:25:00 +01:00
Laurent Destailleur
ed76fef860
Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode
...
NEW Add product search from barcode via REST api.
2018-11-08 19:18:41 +01:00
Laurent Destailleur
5e705ae209
Merge pull request #9950 from grandoc/new_branch_04_11_2018
...
Clean and update code
2018-11-08 19:16:25 +01:00
Laurent Destailleur
78778e4c58
Merge pull request #9948 from frederic34/patch-9
...
FIX mode is only customer in stats fichinter
2018-11-08 19:16:00 +01:00
Laurent Destailleur
a50eb014ee
Merge pull request #9946 from ptibogxiv/patch-88
...
Fix with new stripe payment function
2018-11-08 19:13:38 +01:00
Laurent Destailleur
588de2cc86
Fix filter on entity on project
2018-11-08 18:45:02 +01:00
Laurent Destailleur
27dcf18637
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-08 18:43:31 +01:00
ptibogxiv
cf688a894b
Update api_documents.class.php
2018-11-08 17:20:12 +01:00
Laurent Destailleur
e92a63ba73
FIX If we change customer/supplier rule we can't edit old thirdparty.
2018-11-08 17:15:35 +01:00
Laurent BOUQUET
320e7adef7
Fix blank lines and whitespace at end of lines
2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f
Merge branch 'develop' into feature/product-search-barcode
2018-11-08 16:57:49 +01:00
Laurent Destailleur
6401a7ab06
Fix css
2018-11-08 16:03:10 +01:00
John BOTELLA
98548337ae
FIX supplier order list keep socid
2018-11-08 15:38:25 +01:00
ptibogxiv
8727435216
Update API for download
...
more infos for easiest & better use of the generated file by API
2018-11-08 13:58:37 +01:00
Frédéric FRANCE
8bb1545ed0
Update index.php
2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68
Update index.php
2018-11-08 12:13:07 +01:00
John BOTELLA
7c4dad2728
FIX Warning: count()
2018-11-08 12:12:45 +01:00
Laurent Destailleur
224d37cfeb
Add bootstrap-iso class
2018-11-08 12:12:08 +01:00
Laurent Destailleur
c55f83b0b7
Fix multicompany filter missing
2018-11-08 11:25:29 +01:00
Laurent Destailleur
22170ac1c1
FIX Crop of large files was selecting wrong image area.
2018-11-08 10:45:39 +01:00
Laurent Destailleur
5bbf7e8f1d
Fix look and feel v8
2018-11-08 10:21:43 +01:00
Laurent Destailleur
c74ad61365
Fix look and feel v8
2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796
Fix look and feel v8
2018-11-08 09:51:46 +01:00
Frédéric FRANCE
3ba3a47f20
close window
2018-11-07 22:04:55 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list
2018-11-07 21:51:05 +01:00
AXeL-dev
9dbb222a0a
remove useless line of code
2018-11-07 18:27:41 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
François J
121297b5bd
SQL Join actioncomm_resources
2018-11-07 17:10:51 +01:00
François J
aea01b3208
NEW Work with new table actioncomm_resources and multiple contact affectation
2018-11-07 17:04:18 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
gauthier
70826c3191
FIX : same on lines
2018-11-07 16:32:23 +01:00
gauthier
05a679a10c
FIX : OppStatusShort doesn't exists
2018-11-07 16:26:25 +01:00
François J
afdefa56bd
New Search Contact by Town
...
Adding the missing SQL condition to filter contact list by user requested town
2018-11-07 15:34:07 +01:00
Philippe GRAND
f6394e4210
fix : error 500
2018-11-07 15:07:57 +01:00
Philippe GRAND
671b4dc227
fix : missing translation
2018-11-07 14:01:49 +01:00
Laurent Destailleur
46db246273
Look and feel v9: Autofocus on create forms
2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
Laurent Destailleur
c5231112c5
Fix regression with old canvas
2018-11-07 12:22:12 +01:00
John BOTELLA
abb6b41f91
Fix screen size fall
2018-11-07 11:25:13 +01:00
John BOTELLA
9d780a1722
Fix sign
2018-11-07 10:11:29 +01:00
madx666
2ff69bb3fc
Fix viewTicketMessages for ticket module
2018-11-07 10:11:28 +01:00
madx666
c76c2e0d3e
Fix newMessagePublic for ticket module
2018-11-07 10:08:38 +01:00
John BOTELLA
4f7be36249
fix extrafield hidden
2018-11-07 09:14:29 +01:00
Laurent Destailleur
c1cf4fbb95
Fix phpcs
2018-11-06 20:29:58 +01:00
Laurent Destailleur
7dd941dd51
Fix bad fix
2018-11-06 19:51:16 +01:00
Laurent Destailleur
c4db549f94
Work on emailcollector
2018-11-06 19:49:52 +01:00
Laurent Destailleur
a976dd74db
Fix Report error if file size too large
2018-11-06 18:44:51 +01:00
Laurent Destailleur
e0070bd348
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5
FIX export only prices of the current entity !
2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677
Fix max size
2018-11-06 17:40:59 +01:00
Laurent Destailleur
1e801c7c8a
Fix css
2018-11-06 16:50:31 +01:00
Laurent Bouquet
f05b67909b
NEW : Add product search from barcode via REST api
2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900
NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and
...
SHIPPING_PDF_HIDE_QTYTOSHIP
2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008
Code comment
2018-11-06 09:39:22 +01:00
Laurent Bouquet
cb10da4d41
[Core] Add product search from barcode via REST api
2018-11-05 23:06:19 +01:00
Laurent Bouquet
0f43521274
Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45
2018-11-05 22:52:57 +01:00
Laurent Destailleur
15dd2b3e35
Work on email collector
2018-11-05 21:19:09 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518
Debug modulebuilder
2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08
Debug emailcollector
2018-11-05 16:59:40 +01:00
Laurent Destailleur
eb9defcf1d
Debug emailcollector
2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87
Debug new modules
2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Laurent Destailleur
f0305a7beb
Prepare 8.0.4
2018-11-05 13:50:12 +01:00
Laurent Destailleur
9556a6dfb9
Remove warning
2018-11-05 12:31:35 +01:00
Laurent Destailleur
c988e2e681
Fix phpcs
2018-11-05 10:44:37 +01:00
Laurent Destailleur
4c591daab1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2018-11-05 10:39:22 +01:00
Laurent Destailleur
90729c03c4
Fix dependencies of new modules
2018-11-05 10:28:44 +01:00
Laurent Destailleur
56a70ab4e5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 10:23:15 +01:00
Laurent Destailleur
693cf72fca
Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access
...
FIX: task time screen: bad task assignments
2018-11-05 10:21:28 +01:00
Laurent Destailleur
01d7b1e96a
Fix readme detection
2018-11-05 10:15:22 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 09:56:00 +01:00
Laurent Destailleur
a9bbb82e98
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:55:12 +01:00
Laurent Destailleur
bf2c521988
Fix warning
2018-11-05 09:55:00 +01:00
Laurent Destailleur
1afdf7a961
Merge pull request #9947 from bafbes/abb80042
...
New : help picto for fields in creation
2018-11-05 09:54:42 +01:00
Laurent Destailleur
7c3cb7d73c
Update commonfields_add.tpl.php
2018-11-05 09:54:11 +01:00
Laurent Destailleur
ccf6554f76
Merge pull request #9941 from ptibogxiv/patch-87
...
Fix various fix cmail, payout, const, connect
2018-11-05 09:38:41 +01:00
Laurent Destailleur
6fd76f5ffb
Merge pull request #9939 from ptibogxiv/patch-86
...
Fix ext_payment_site
2018-11-05 09:37:45 +01:00
Laurent Destailleur
6b89bc4ecc
Merge pull request #9937 from aspangaro/9.0_FEC
...
Debug asset module
2018-11-05 09:36:42 +01:00
Laurent Destailleur
8b373fb7a3
Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent
...
Fix parent link was not removed on societe deletion #9106
2018-11-05 09:35:41 +01:00
Laurent Destailleur
ce25c6644f
Merge pull request #9952 from andreubisquerra/master
...
No posibility to validate if invoice not exist
2018-11-05 09:27:12 +01:00
Laurent Destailleur
98a3af620b
FIX #9934
2018-11-05 09:26:23 +01:00
Laurent Destailleur
4e0dbc1826
Merge pull request #9932 from grandoc/new_branch_01_11_2018
...
complete comment
2018-11-05 09:20:00 +01:00
Laurent Destailleur
58b7201529
Merge pull request #9931 from aspangaro/9.0_accountancy
...
Fix Specific finename for FEC export only available on general ledger export
2018-11-05 09:19:42 +01:00
Laurent Destailleur
234c35e940
Merge pull request #9930 from frederic34/fixphpcs
...
fix phpcs
2018-11-05 09:18:34 +01:00
Laurent Destailleur
d130e79384
Merge pull request #9936 from ptibogxiv/patch-84
...
Fix payout
2018-11-05 09:17:18 +01:00
andreubisquerra
86b98db2a2
No posibility to validate if invoice not exist
2018-11-04 20:36:23 +01:00
Philippe GRAND
eb49558600
Clean and update code
2018-11-04 12:09:16 +01:00
Frédéric FRANCE
488ac8c8f0
Update index.php
2018-11-03 23:44:25 +01:00
Laurent Destailleur
90d3b80efb
NEW Add email in event histor for reminder email of expired subsription
2018-11-03 22:53:55 +01:00
Frédéric FRANCE
c01113e28b
typo
2018-11-03 22:49:30 +01:00
Laurent Destailleur
f4346c1469
Fix css
2018-11-03 19:24:28 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
c4bf0f0e03
CSS Flex
2018-11-03 18:57:18 +01:00
Frédéric FRANCE
d6b909a280
Update index.php
2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7
mode is only customer in stats fichinter
2018-11-03 18:20:36 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Laurent Destailleur
7e55701774
2 remind of subscription expired by default
2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2
2 remind of expired subscription by default
2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178
Fix family of module
2018-11-03 11:38:29 +01:00
Laurent Destailleur
28d5f1d50b
Fix sql syntax error
2018-11-03 11:30:32 +01:00
Abbes Bahfir
5f4d644cab
New : help picto for fields in creation
2018-11-03 11:12:50 +01:00
ptibogxiv
171d36d4fc
Update payment.php
2018-11-02 17:49:11 +01:00
ptibogxiv
ab53885ef8
Fix with new stripe payment function
2018-11-02 17:22:42 +01:00
ptibogxiv
d5a910841f
Fix various fix cmail, payout, const, connect
2018-11-01 23:20:28 +01:00
ptibogxiv
b34f781686
Fix ext_payment_site
2018-11-01 23:04:10 +01:00
Alexandre SPANGARO
8d8023b405
Debug asset module
2018-11-01 22:32:33 +01:00
ptibogxiv
263e8ed4af
Fix payout
2018-11-01 20:45:08 +01:00
Maxime Kohlhaas
29c0448a2e
Fix parent link was not removed on societe deletion #9106
2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0
Fix tracking field in dictionnary should not be mandatory
2018-11-01 15:33:14 +01:00
Laurent Destailleur
1140735554
Fix css
2018-11-01 15:20:05 +01:00
ptibogxiv
a46f29cb98
Update Stripe Version API
...
The description field on customer endpoints has a maximum character length limit of 350 now. The name field on product endpoints has a maximum character length limit of 250 now. The description field on invoice line items has a maximum character length limit of 500 now.
The billing_reason attribute of the invoice object now can take the value of subscription_create, indicating that it is the first invoice of a subscription. For older API versions, billing_reason=subscription_create is represented as subscription_update.
2018-11-01 12:02:36 +01:00
Philippe GRAND
b7f5e9e6c7
complete comment
2018-11-01 11:50:55 +01:00
Alexandre SPANGARO
af1305a0a8
Fix Specific finename for FEC export only available on general ledger export
2018-11-01 07:24:48 +01:00
Frédéric FRANCE
aa8236dd98
fix phpcs
2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb
Fix public
2018-10-31 17:30:08 +01:00
Laurent Destailleur
dfb20c705e
NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE
2018-10-31 16:05:50 +01:00
Laurent Destailleur
4b402aa6d1
Fix regression on name of array
2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94
FIX Error generating ODT when option to use contact on doc on
2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f
Debug v9
2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2018-10-31 11:50:29 +01:00
Laurent Destailleur
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Laurent Destailleur
ea5b0f53d0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 22:32:54 +01:00
Laurent Destailleur
866729cd21
FIX bad link in notification
2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5
Fix remove var_dump
2018-10-30 21:34:17 +01:00
Laurent Destailleur
a44fbfb2e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 21:30:57 +01:00
Laurent Destailleur
3d16b05fdb
Fix fetch
2018-10-30 21:30:44 +01:00
Frédéric FRANCE
46fd3bcaf8
fix display holiday month report if none
2018-10-30 21:15:52 +01:00
Laurent Destailleur
064417dcf1
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2
...
Fix invoice creation from contract was invoicing closed services #9087
2018-10-30 21:13:38 +01:00
Frédéric FRANCE
395e9ceae2
fix stats display expensereport
2018-10-30 20:36:12 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
f845a52b20
Fix phpcs
2018-10-30 16:37:50 +01:00
Marc de Lima Lucio
2fbc305683
FIX: task time screen: last fix was overkill
2018-10-30 16:00:56 +01:00
Laurent Destailleur
a3e49f021d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 15:32:25 +01:00
Laurent Destailleur
2c3cd7a668
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSyslog.class.php
2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58
Fix phpcs
2018-10-30 15:30:04 +01:00
Laurent Destailleur
ecdecfcbce
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 15:28:23 +01:00
Laurent Destailleur
2b526f7469
Fix phpcs
2018-10-30 15:28:11 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
...
FIX missing name alias field in societe import/export #9091
2018-10-30 15:00:34 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone
...
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice
...
Fix clone fourn order and invoice lines special code
2018-10-30 14:55:50 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041
...
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27
...
make play and playdisable equals
2018-10-30 14:49:54 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change
...
Fix changing currency in a doc was recalculating amounts in company currency #9801
2018-10-30 14:48:46 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f
Clean code
2018-10-30 14:27:14 +01:00
Laurent Destailleur
a231932972
Merge pull request #9904 from atm-maxime/fix_replenish_qtymin
...
FIX replenish wasn't caring about supplier price min quantity #9561
2018-10-30 14:25:55 +01:00
Laurent Destailleur
0f850cfa3e
Merge pull request #9901 from frederic34/patch-22
...
use strict compare
2018-10-30 14:23:40 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21
...
use strict compare
2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20
...
use strict compare
2018-10-30 14:23:01 +01:00
Laurent Destailleur
6c9f02e9c6
Merge pull request #9898 from frederic34/patch-18
...
use strict compare
2018-10-30 14:22:19 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug
...
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-30 14:16:29 +01:00
Laurent Destailleur
8ce035fc36
Merge pull request #9894 from librethic-code/patch-1
...
FIX: keep external module element when adding resource
2018-10-30 14:06:38 +01:00
Laurent Destailleur
40cc2157ae
Merge pull request #9902 from frederic34/patch-24
...
use strict compare
2018-10-30 13:58:06 +01:00
Laurent Destailleur
b4c9df65f9
FIX #9907 Can set several modules on ->depends
2018-10-30 13:56:51 +01:00
Laurent Destailleur
d309f22e55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf
FIX #9907
2018-10-30 13:54:11 +01:00
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0
...
merging and typo
2018-10-30 12:41:56 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php
2018-10-30 12:41:06 +01:00
Laurent Destailleur
4d0cc0a03d
Merge pull request #9895 from hregis/develop_bug2
...
FIX remove deprecated and unused file
2018-10-30 12:32:20 +01:00
Laurent Destailleur
06bffeeca5
Merge pull request #9910 from atm-ph/fix_8.0_pgsql
...
Fix pgsql : operator does not exist: timestamp without time zone ~~ u…
2018-10-30 12:31:04 +01:00
Laurent Destailleur
a8e6c3832e
Update list.php
2018-10-30 12:30:56 +01:00
Marc de Lima Lucio
8911d72be8
FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do
2018-10-30 12:28:04 +01:00
Laurent Destailleur
d938711e1e
Merge pull request #9883 from frederic34/patch-9
...
fix phpcs
2018-10-30 12:27:37 +01:00
Laurent Destailleur
bddd658ba6
Merge pull request #9885 from frederic34/patch-15
...
code comment html form class
2018-10-30 12:27:19 +01:00