lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,446 Commits 43 Branches 150 Tags 886 MiB
9.0.2
Commit Graph

63282 Commits

Author SHA1 Message Date
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