Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
ptibogxiv
a489207122
Fix force recalculate price with multicurrency
2019-08-12 13:56:12 +02:00
Laurent Destailleur
deb6186338
Merge pull request #11569 from aspangaro/11.0_fiscalyear
...
NEW Box use fiscal year
2019-08-10 01:47:55 +02:00
John Botella
401dc12b93
Add color blind option in body for css impact
2019-08-07 12:15:55 +02:00
John Botella
63191dab7d
Add user color blind option
2019-08-07 12:03:19 +02:00
John Botella
cafd4fc599
New living color for chart
2019-08-06 15:24:42 +02:00
John Botella
bc0508164b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-06 09:57:49 +02:00
Ferran Marcet
32220dde2e
FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
2019-08-05 14:12:19 +02:00
Laurent Destailleur
d663657f15
FIX format of field with type timestamp
2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c
FIX format of field with type timestamp
2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92
FIX Missing where on entity
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935
FIX Missing where on entity
2019-08-03 16:32:35 +02:00
Alexandre SPANGARO
7eb48a3f9c
Fix month of the fiscal year start min 1 max 12 / january = 1
2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
552f160235
Merge branch 'develop' into 11.0_fiscalyear
2019-08-03 05:59:57 +02:00
Laurent Destailleur
55e9335cd2
Fix code comment
2019-08-02 19:26:04 +02:00
Laurent Destailleur
4fb8f6663a
Fix code comment
2019-08-02 17:16:13 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Juanjo Menent
03a2377abc
Fix: allow access from any other class that inherits Form class.
2019-08-02 12:31:24 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
Laurent Destailleur
6512435f9f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:27:55 +02:00
Laurent Destailleur
a260e7391f
FIX for #11232
2019-08-01 14:24:54 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField
...
Fix sellist showOuputField
2019-07-30 21:40:37 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Vaadasch
23bca6f4cd
Change "DOCUMENT_URI" to "PHP_SELF"
...
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec
Change 0 and 1 to FALSE and TRUE for pgsql
...
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
2019-07-30 19:35:03 +02:00
Alexandre SPANGARO
b146004966
Fix travis
2019-07-30 11:06:40 +02:00
Alexandre SPANGARO
8228979e67
Fix travis
2019-07-30 09:18:18 +02:00
Laurent Destailleur
ecc0b4ed32
Add prefixsession in event table
2019-07-29 02:16:21 +02:00
Alexandre SPANGARO
3e69421ec3
Fix travis
2019-07-28 07:33:57 +02:00
ATM john
581ae226ff
Fix sellist showOuputField
2019-07-27 18:25:25 +02:00
Maxime Kohlhaas
5c2763d0dd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin
2019-07-27 10:53:43 +02:00
Alexandre SPANGARO
83e2f71e07
Fix travis
2019-07-27 07:56:33 +02:00
Alexandre SPANGARO
053ae8224b
NEW Box use fiscal year (Thanks Yves57)
2019-07-27 06:36:39 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Nicolas ZABOURI
3bdbbc7147
NEW list of boxes area
2019-07-26 17:17:59 +02:00
Laurent Destailleur
1ca3c6e3ae
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-26 13:17:47 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
111c0dcadd
Comment
2019-07-25 17:46:48 +02:00
Laurent Destailleur
389976699c
Fix responsive
2019-07-24 16:29:50 +02:00
Laurent Destailleur
9ddb8a5b0b
Fix tooltip to say closed project are not visibles
2019-07-23 14:41:29 +02:00
Laurent Destailleur
59555d00ff
Merge pull request #11531 from BadPixxel/patch-5
...
FIX: Units Scale Missing in Object CRUD
2019-07-22 18:31:43 +02:00
Regis Houssin
6409cc06ae
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-22 11:44:56 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99
FIX missing token
2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8
FIX missing token
2019-07-20 11:44:31 +02:00
Laurent Destailleur
de4142e23e
FIX Add message from public interface
2019-07-19 23:57:35 +02:00
Laurent Destailleur
ec34ce1e64
Maxi debug of module ticket
2019-07-19 23:11:00 +02:00
Laurent Destailleur
48b4aa4c8d
Fix link to ticket
2019-07-19 18:29:33 +02:00
Laurent Destailleur
73af3542d1
FIX the feature to bill time spent was not enabled.
2019-07-19 16:18:14 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
BadPixxel
b88d19e8e4
FIX: Units Scale Missing in Object CRUD
2019-07-19 12:24:53 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Christophe Battarel
aab23a1531
FIX : do not return formatted prices in json string
2019-07-16 17:50:43 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85
Fix save of doc template for recuring invoices.
2019-07-14 00:10:15 +02:00
Laurent Destailleur
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price
...
FIX element name in update_price
2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php
2019-07-13 22:29:50 +02:00
Laurent Destailleur
b1e21ed5fc
FIX Computed field were not calculated into lists.
2019-07-11 22:18:44 +02:00
Nicolas ZABOURI
abd0abf115
FIX element name in update_price
2019-07-10 18:36:12 +02:00
Regis Houssin
41b004c2b8
FIX better compatibility with multicompany transverse mode
2019-07-10 12:16:32 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Maxime Kohlhaas
9c47cb6f91
NEW : can choose lines while creating order from origin
2019-07-08 23:16:32 +02:00
Laurent Destailleur
4387d40b9a
Translation lignes -> lines
2019-07-05 21:55:08 +02:00
Laurent Destailleur
709b738d75
Fix regression
2019-07-05 18:54:51 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
e3359c6f0f
FIX Can't submit a ticket from public interface
2019-07-05 11:21:04 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1
...
Feature request: Extrafields - store computed value #11435
2019-07-04 16:23:08 +02:00
Laurent Destailleur
35bce50a1d
Merge pull request #11455 from atm-florianm/FIX_add_hook_to_fileupload_to_enable_modules_to_override_upload_options
...
NEW: Add hook on fileupload.class.php to enable modules to override…
2019-07-04 12:50:21 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php
2019-07-04 12:20:34 +02:00
atm-florian.m
cf458c77dc
FIX: hook added on fileupload.class.php to enable modules to override upload options
2019-07-04 12:04:39 +02:00
Laurent Destailleur
27ba3408b4
Fix code comment
2019-07-04 02:01:55 +02:00
atm-greg
2f5b9ccb22
fix case objecttmp is an invoice
2019-07-03 17:00:18 +02:00
Frans Bosman
cd7d4de6ec
Update commonobject.class.php
2019-07-03 16:53:26 +02:00
Frans Bosman
116c6d7a6a
Update commonobject.class.php
2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930
Update commonobject.class.php
2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add
Update commonobject.class.php
2019-07-03 06:59:52 +02:00
fbosman
3e91fdda77
Update commonobject.class.php
2019-07-01 12:34:27 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Laurent Destailleur
d71330c00b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php
2019-06-28 12:56:31 +02:00
fbosman
f44203775a
Update extrafields.class.php
2019-06-28 07:10:28 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
70967b4ea1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd
Fix purge of old files
2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb
Fix we need to keep temp dir
2019-06-25 19:02:24 +02:00
Laurent Destailleur
f984a77044
FIX Fallback on main language for alternative languages
2019-06-25 14:05:10 +02:00
Laurent Destailleur
fffdd8797d
FIX Fallback on main language for alternative languages
2019-06-25 14:04:34 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse
...
NEW add extrafield separator collapsing capabilities
2019-06-24 19:04:51 +02:00
Laurent Destailleur
604633afd1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69
FIX #11218 #11150
2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100
FIX #11218 #11150
2019-06-24 18:40:31 +02:00
Laurent Destailleur
609eefaf08
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:36:08 +02:00
Laurent Destailleur
28024d5cd1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:28:48 +02:00
Laurent Destailleur
84575df7e6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
John Botella
ec7446762c
Fix travis
2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0
Code comment
2019-06-24 14:31:58 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
9c54de57ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-23 18:12:56 +02:00
Laurent Destailleur
1c48b8be32
Fix code comment
2019-06-23 17:23:41 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609
Code comment
2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
5c3d3cec9e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 18:44:12 +02:00
Laurent Destailleur
662afe8a36
Fix missing global
2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Laurent Destailleur
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +02:00
Laurent Destailleur
c63b465d48
Fix doxygen
2019-06-21 14:34:04 +02:00
Bahfir Abbes
7f34a03034
It's just a mistake. In order to declare a getnomUrl method, Ccountry does not need to extend Commonobject
2019-06-20 20:55:48 +01:00
Laurent Destailleur
bb9b0d401e
Fix phpcs
2019-06-20 13:56:20 +02:00
florian HENRY
0865bdb60f
fix depending extrafeilds list
2019-06-20 12:16:48 +02:00
John Botella
b21006614c
Fix substitutions null
2019-06-20 12:00:44 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
...
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
2c0d43a27a
Merge pull request #11372 from bafbes/abb90059
...
New:Show c_country elements in modulebuilder
2019-06-20 03:32:53 +02:00
Laurent Destailleur
2b0b7b0dab
Update ccountry.class.php
2019-06-20 03:32:28 +02:00
Laurent Destailleur
13200a4d51
Merge pull request #11350 from frederic34/patch-7
...
NEW can specify hour start end for selectDate and step for minutes
2019-06-20 03:24:23 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
...
Allow zero as account number
2019-06-20 03:09:37 +02:00
Laurent Destailleur
04f2fb604f
Fix duplicate 'option_' in prefix
2019-06-19 15:48:37 +02:00
Laurent Destailleur
2034faf280
Fix duplicate 'option_' in prefix
2019-06-19 15:48:04 +02:00
Abbes Bahfir
c109eebe38
New:Show c_country elements in modulebuilder
2019-06-19 14:43:18 +01:00
Abbes Bahfir
695a00f21c
New:Show labels of countries in modulebuilder
2019-06-19 14:04:18 +01:00
Laurent Destailleur
f9cc120d75
Debug module ticket
2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
c59de49894
Translate rights
2019-06-18 22:38:52 +02:00
Eric Seigne
0b3bc5a172
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d
allow zero as accountancy code nomber (replace all empty tests by != '')
2019-06-17 18:28:11 +02:00
Laurent Destailleur
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Frédéric FRANCE
1a1f3493c9
NEW can specify hour start end for selectDate and step for minutes
2019-06-17 14:03:57 +02:00
Laurent Destailleur
8330078de1
Fix default value
2019-06-17 12:33:09 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186
...
Fix measuring_units_string display function
2019-06-14 13:48:31 +02:00
Laurent Destailleur
e8b139d1c6
Fix repeated logs and fetch
2019-06-13 22:48:31 +02:00
Laurent Destailleur
f00c9a10db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a
Fix syntax error
2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/html.formother.class.php
2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516
code comment
2019-06-13 11:07:38 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php
2019-06-13 09:59:10 +02:00
Laurent Destailleur
e81663ec34
Fix cropping of image files for BOM module was ko
2019-06-12 19:00:34 +02:00
atm-greg
47746fd17d
fix template type
2019-06-12 12:30:49 +02:00
Laurent Destailleur
4c44378049
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-07 16:56:39 +02:00
florian HENRY
3927a74d6b
fix scrunitizer
2019-06-05 16:30:22 +02:00
florian HENRY
1cf38fa635
fix scrutinizer
2019-06-05 16:08:04 +02:00
Laurent Destailleur
1229f64632
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-04 19:04:33 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
79a3e41418
Hook 'getAccessForbiddenMessage'
2019-06-04 12:48:06 +02:00
Laurent Destailleur
664e0b81d8
Debug module BOM
2019-06-03 22:07:34 +02:00
Laurent Destailleur
b526f7da43
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-03 20:47:12 +02:00
Laurent Destailleur
a143dba9f8
Work on incomplete code on BOM module
2019-06-03 20:46:11 +02:00
Laurent Destailleur
7d2cedfdcf
Debug bom module
2019-06-03 19:29:49 +02:00
Laurent Destailleur
72f55e1d81
Debug modulebuilder
2019-06-03 18:11:53 +02:00
Regis Houssin
5726b40a10
FIX try to use WHERE EXISTS instead DISTINCT
2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc
FIX missing compatibility with multicompany transverse mode
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-03 17:22:15 +02:00
Laurent Destailleur
213936aac1
Fix combo
2019-06-03 16:20:04 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
d8adda82f9
Merge pull request #11291 from AXeL-dev/patch-9
...
Fix #11256
2019-06-02 12:23:27 +02:00
Laurent Destailleur
5f0fbcea9a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
AXeL-dev
82b37a514c
Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '')
2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b
Fix #11256
2019-06-01 15:00:15 +00:00
Laurent Destailleur
f2088a084f
Fix error management
2019-05-31 11:53:30 +02:00
Laurent Destailleur
cd75794aaa
FIX #11169 #11202
2019-05-31 11:38:54 +02:00
Laurent Destailleur
912e29a746
FIX #11244
2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690
Fix useless test
2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0
...
FIX : do not include tpl from disabled modules
2019-05-29 10:35:39 +02:00
Laurent Destailleur
1c3f519b1a
Remove warnings
2019-05-28 12:54:35 +02:00
Laurent Destailleur
15de8a9497
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
2019-05-27 19:22:51 +02:00
Laurent Destailleur
a138c05457
Fix colspan
2019-05-27 13:28:10 +02:00
Laurent Destailleur
b81c3a6d2b
Fix look and feel v10
2019-05-26 18:23:30 +02:00
Christophe Battarel
83d883c36a
finally eldy is always right
2019-05-24 15:14:34 +02:00
Laurent Destailleur
ccfb4f575b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-24 14:58:21 +02:00
Christophe Battarel
545cdd0762
test include return on FALSE
2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8
test include return on TRUE
2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347
FIX : do not include disabled modules tpl
2019-05-24 12:10:58 +02:00
Laurent Destailleur
43e098caae
Fix phpcs
2019-05-23 12:35:53 +02:00
Laurent Destailleur
111239094a
Work to finish module BOM for v10
2019-05-22 20:28:24 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
f99f1d83c2
Merge pull request #11229 from frederic34/patch-7
...
target _blank depend of mime
2019-05-21 22:42:36 +02:00
Laurent Destailleur
5707aff7c4
Look and feel v10
2019-05-21 21:52:04 +02:00
Laurent Destailleur
fdeb12a909
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea
FIX Error management when MAILING_NO_USING_PHPMAIL is set
2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Frédéric FRANCE
84781cabac
target _blank depend of mime
...
target _blank is added in the previous line depending on mimtype
2019-05-21 13:11:17 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
Laurent Destailleur
ae3605d82d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/core/class/extrafields.class.php
2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-20 15:40:50 +02:00
Laurent Destailleur
c3732f2b7a
Fix edition of margins in recurring invoices
2019-05-20 14:41:47 +02:00
Laurent Destailleur
27ed095181
Debug BOM module
2019-05-19 16:40:25 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
florian HENRY
e4d87ab2e7
fix : #11189
2019-05-19 02:05:13 +02:00
Maxime Kohlhaas
6c195d7bdf
Add warning delay for holidays
2019-05-18 17:07:29 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
florian HENRY
9ef5767fd5
phpcs
2019-05-18 12:28:39 +02:00
florian HENRY
730820bb26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e
fix pb with multicompny payment dictionnary on faxcture card
2019-05-18 12:11:28 +02:00
Laurent Destailleur
26d4875f8f
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-18 02:26:40 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta
2019-05-16 21:21:51 +02:00
Laurent Destailleur
d1e5c525aa
Fix warning
2019-05-16 14:47:42 +02:00
Francis Appels
6e5d826d65
Clean PHPCS for commonobject.class
2019-05-13 22:02:33 +02:00
atm-greg
644f247910
fix useless calculation
2019-05-13 12:02:46 +02:00
Regis Houssin
3cb6ca34e9
FIX multicompany compatibility
2019-05-12 16:06:16 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
a664cd6461
Fix check when uploading a non image as user photo
2019-05-10 20:09:41 +02:00
Laurent Destailleur
cc64e3e5c0
Fix responsive
2019-05-10 19:38:08 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
069df82380
FIX javascript error when ckeditor module not enabled
2019-05-10 17:40:34 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
atm-arnaud
4c90ba1a64
FIX attached files list with link file was broked
2019-05-09 12:11:18 +02:00
Laurent Destailleur
c2abedeb24
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-08 21:43:57 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e
Fix bad contact used
2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b
Fix showdocument for external modules
2019-05-08 17:31:50 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1
...
FIX Add support for units
2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php
2019-05-08 02:02:07 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
Rüdiger Hahn
4008e26328
Add support for units
...
Fetch units from db when they've been enabled in configuration
2019-05-06 13:12:41 +02:00
Lionel VESSILLER
87e83a7967
New add extrafield separator collapse with theses specific values
...
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
2019-05-03 16:14:44 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
86f5889a72
Merge pull request #11078 from Supermanu/help_extrafields
...
Show help text for extrafields in forms
2019-05-02 12:36:15 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Laurent Destailleur
61bf731d17
FIX Balance of td
2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af
Fix balance of colspan
2019-04-30 16:44:11 +02:00
Laurent Destailleur
3007905508
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Supermanu
bbc6c0fe0c
Show help text for extrafields in forms
2019-04-29 20:18:47 +02:00
Laurent Destailleur
627ef14454
FIX The autocopy feature was ko for suppliers
2019-04-29 18:51:15 +02:00
Laurent Destailleur
5253c759af
Fix overwrite feature
2019-04-27 21:42:52 +02:00
Laurent Destailleur
410a3801da
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-04-27 13:27:52 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
01075081cb
FIX CVE-2019-11200
2019-04-25 22:25:19 +02:00
gauthier
31897f54ac
Fix prev situation invoice selection (backport fix 8.0)
2019-04-25 12:37:05 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Laurent Destailleur
8aa8efcb14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 11:25:23 +02:00
Laurent Destailleur
99639ef429
FIX #11013
2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf
FIX #11013
2019-04-24 11:23:49 +02:00
Laurent Destailleur
4421dedbd2
Merge pull request #11008 from aspangaro/10.0_closure
...
FIX: Update blocked by datec on fiscal year
2019-04-24 10:28:23 +02:00
Laurent Destailleur
633eb1d6c6
Remove warning
2019-04-23 13:28:42 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Alexandre SPANGARO
c1ecfae6f2
FIX: Update on fiscal year
2019-04-13 22:46:40 +02:00
Laurent Destailleur
8e9a4e1877
Fix output of fields with type "real"
2019-04-13 10:42:43 +02:00
Laurent Destailleur
ebe8f27c16
Fix on smartphone
2019-04-13 10:29:09 +02:00
atm-quentin
6deba39c6a
FIX credit note can be split
2019-04-12 10:16:13 +02:00
Lionel VESSILLER
09ce5bd977
Fix dropdown menu in pages with several lists
2019-04-11 17:59:11 +02:00
Laurent Destailleur
ac25003d33
Dolibarize module ticket
2019-04-10 11:39:54 +02:00
Laurent Destailleur
861c1b412c
CSS
2019-04-09 19:23:34 +02:00
Laurent Destailleur
7790140f22
CSS
2019-04-09 14:13:34 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
d01b54ca5b
Fix phpcs
2019-04-08 18:02:27 +02:00
Laurent Destailleur
1274d71a10
Fix phpcs
2019-04-08 16:00:01 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
...
New pdf document column system : supplier order and expedition
2019-04-08 13:31:47 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options
...
New categories options in sellist and chbxlist extrafields
2019-04-08 13:28:51 +02:00
Laurent Destailleur
7b85a7977b
Update html.form.class.php
2019-04-08 13:28:32 +02:00
Laurent Destailleur
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
1ffb5a72d5
Replace image with font awesome
2019-04-05 14:45:54 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
John BOTELLA
a668cc28b1
Add table title auto height
2019-04-03 16:19:49 +02:00
Laurent Destailleur
eb6bd20132
Fix error message
2019-04-03 16:16:51 +02:00
Lionel VESSILLER
8a220b9da1
New categories options in sellist and chbxlist extrafields
2019-04-02 11:01:46 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
c07159fee9
Fix regression in timesheet. Keep extrafield of task for the moment.
2019-03-31 22:06:41 +02:00
ptibogxiv
69b04e2189
Update html.formother.class.php
2019-03-31 19:28:45 +02:00
ptibogxiv
13c93ba1c2
transfert from html.form.class.php
2019-03-31 19:26:40 +02:00
ptibogxiv
1a228ed95c
transfert to html.otherform.class.php
2019-03-31 19:25:45 +02:00
Laurent Destailleur
ecd049b4e6
Debug dolistore
2019-03-31 13:39:51 +02:00
ptibogxiv
2cc9b61a9f
Update html.form.class.php
2019-03-27 11:10:30 +01:00
Laurent Destailleur
d8212d84df
Debug emailcollector
2019-03-26 19:15:18 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
524f171168
FIX old export models was not visible
2019-03-26 12:12:16 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd
Better responsive
2019-03-25 09:14:28 +01:00
Laurent Destailleur
5ff76e2c13
WIP file attachment on expense report lines
2019-03-24 12:15:19 +01:00
Laurent Destailleur
20f3af066c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
c569e71bc8
Fix remove warnings
2019-03-23 12:04:50 +01:00
Laurent Destailleur
d79d5d5a23
Fix var name not defined
2019-03-22 13:20:37 +01:00
Laurent Destailleur
52d3e89276
FIX function not found
2019-03-22 12:21:31 +01:00
Laurent Destailleur
a92ff42be8
FIX function not found
2019-03-22 12:12:42 +01:00
Laurent Destailleur
ee4150665e
Fix phpcs
2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019
...
add some comments
2019-03-21 18:29:11 +01:00
Laurent Destailleur
aa33e4fd2a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 18:26:02 +01:00
Philippe GRAND
7988481688
add some comments
2019-03-21 15:06:14 +01:00
Philippe GRAND
96893315b5
add some comments
2019-03-21 15:03:01 +01:00
Frédéric FRANCE
d10b94e72b
Update extrafields.class.php
2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c
FIX when 2 extra fields are mandatory in 2 different entities
2019-03-21 12:33:39 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
a7fdd34973
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4
FIX Can't insert if there is extrafields mandatory on another entity.
...
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85
FIX Can't insert if there is extrafields mandatory on another entity.
2019-03-21 11:53:04 +01:00
atm-greg
a8cdb63a25
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Hook_on_commonGenerateDocument
2019-03-20 06:49:36 +01:00
Laurent Destailleur
51eab7e2f8
Fix rename tag
2019-03-19 15:21:07 +01:00
Laurent Destailleur
9745bd1f16
NEW Add tag for ODT generation for localtax rates
2019-03-19 15:18:43 +01:00
Laurent Destailleur
eab11ce743
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-19 13:10:17 +01:00
Regis Houssin
57091f08b0
FIX missing entity filter and wrong var name
2019-03-18 10:53:43 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
Laurent Destailleur
39b9ca2397
Work on documentation generation by modulebuilder
2019-03-17 15:45:50 +01:00
Laurent Destailleur
d44be341a5
NEW Add property 'noteditable' in modulebuilder
2019-03-17 01:45:46 +01:00
Laurent Destailleur
95c1275efc
Fix phpcs
2019-03-16 20:10:22 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
a1adcc785c
Clean code
2019-03-15 19:11:24 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
f50638b7d8
Update html.form.class.php
2019-03-14 17:44:54 +01:00
Laurent Destailleur
69bfac7eef
Update html.form.class.php
2019-03-14 17:36:35 +01:00
Laurent Destailleur
c6b3d81d61
Update html.form.class.php
2019-03-14 17:35:44 +01:00
Laurent Destailleur
d4f2a16abf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
2019-03-14 17:10:58 +01:00
Frédéric FRANCE
b67429218d
Update html.formmail.class.php
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2019-03-14 16:52:16 +01:00
Laurent Destailleur
965f4702b0
Merge pull request #10830 from frederic34/patch-4
...
Update html.formmail.class.php
2019-03-14 16:49:34 +01:00
Laurent Destailleur
9f6610a421
Merge pull request #10831 from frederic34/patch-5
...
phpcs fix
2019-03-14 14:04:44 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Frédéric FRANCE
965f5861b3
Update commoninvoice.class.php
2019-03-14 09:10:26 +01:00
Frédéric FRANCE
d8599b52d9
Update html.formmail.class.php
2019-03-14 08:19:22 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
e0208cb3d6
Generation of PDF doc
2019-03-13 18:11:15 +01:00
Laurent Destailleur
9da84f68c7
Bad language file for civility order
2019-03-13 14:23:27 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
da2aba96eb
Can setup tool to build html or pdf for module builder documentation
2019-03-12 11:51:20 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
...
Add badge status css part1
2019-03-11 20:49:31 +01:00
Laurent Destailleur
6daa262779
Files for variables of themes were renamed from graph-color.php into
...
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
540a1026f6
Merge pull request #10786 from frederic34/patch-4
...
update doc in commonobject class
2019-03-11 16:47:40 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
Laurent Destailleur
7e547f3f16
Fix type of parameter
2019-03-11 12:07:28 +01:00
Laurent Destailleur
d659543ac0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-09 19:00:57 +01:00
Laurent Destailleur
fa4467fb5f
FIX Tooltip on click was ko on smartphone
2019-03-09 18:37:07 +01:00
Frédéric FRANCE
b47a54c652
update doc in commonobject class
2019-03-09 18:05:48 +01:00
Laurent Destailleur
c6d7987b57
FIX method db->active does not exists
2019-03-09 01:06:07 +01:00
Laurent Destailleur
73b359c124
Fix class visibility
2019-03-09 00:54:10 +01:00
Laurent Destailleur
fb5757a633
Merge pull request #10775 from frederic34/fourn-html5
...
replace html by html5 in fourn
2019-03-08 19:36:11 +01:00
Laurent Destailleur
86f4e81a6e
Merge pull request #10773 from frederic34/patch-2
...
Update stats.class.php
2019-03-08 19:33:40 +01:00
Laurent Destailleur
ebc2289292
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719
NEW Can upload files from the edit page of expense report
2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn
2019-03-07 20:46:38 +01:00
Frédéric FRANCE
1917adb980
Update stats.class.php
...
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
2019-03-07 17:35:02 +01:00
Laurent Destailleur
4ecc1dac56
Merge pull request #10756 from altatof/fp2
...
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
2019-03-07 17:29:10 +01:00
John BOTELLA
97544e0aea
add new dolGetStatus to LibStatut in common invoice class
2019-03-07 15:24:11 +01:00
Laurent Destailleur
8d0a8d8263
Merge pull request #10758 from altatof/lf
...
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-07 14:18:26 +01:00
Laurent Destailleur
daaa4ca0c2
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
...
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-07 12:49:13 +01:00
Laurent Destailleur
8ffab05f67
Merge pull request #10759 from altatof/ml
...
NEW : sort list of models alphabetically
2019-03-07 12:47:50 +01:00
Laurent Destailleur
fc87090669
Merge pull request #10764 from frederic34/patch-7
...
New format type 5 for email
2019-03-07 12:33:24 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Frédéric FRANCE
d39b600ff4
Update CMailFile.class.php
2019-03-06 20:29:58 +01:00
Christophe Battarel
8f8fe0648e
fix bad copy paste
2019-03-06 17:24:50 +01:00
Christophe Battarel
4382a26c87
sort list of models alphabetically
2019-03-06 17:21:44 +01:00
Christophe Battarel
ceab55f26b
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-06 17:07:51 +01:00
Christophe Battarel
4e533b2a91
better constant test
2019-03-06 16:41:28 +01:00
Christophe Battarel
d3bb9d2cc2
add contant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
2019-03-06 16:37:02 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-05 22:10:46 +01:00
gauthier
598d1fc914
FIX : extrafields always visible on view mode
2019-03-05 16:53:36 +01:00
Laurent Destailleur
bbbffae72b
Fix phpcs
2019-03-05 16:27:19 +01:00
Laurent Destailleur
b851911708
Dolibarize module ticket
2019-03-05 12:18:46 +01:00
Laurent Destailleur
99e79d1750
Fix regression with private property
2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e
Work on BOM
2019-03-04 14:01:30 +01:00
Laurent Destailleur
15a6da1a8c
Fix alignement css
2019-03-03 17:03:09 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Frédéric FRANCE
8c23b41f9a
autoloader for egulias lib needed by swiftmailer
2019-03-02 14:32:52 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Laurent Destailleur
7606c73fd5
Merge pull request #10704 from iouston/patch-1
...
NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT
2019-02-28 11:18:12 +01:00
Laurent Destailleur
c240c66789
Update html.formfile.class.php
2019-02-28 11:17:43 +01:00
Frédéric FRANCE
cc1ee2d883
add visibility
2019-02-27 23:55:18 +01:00
wdammak
8e8c68345a
phpcs simplification
2019-02-27 21:41:55 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 15:48:31 +01:00
Laurent Destailleur
3bffa69f1d
Remove deprecated code
2019-02-27 15:23:56 +01:00
Laurent Destailleur
836eff1233
Merge pull request #10698 from wdammak/patch-32
...
Add parent establishment
2019-02-27 13:34:50 +01:00
Laurent Destailleur
f2dc687202
Update html.formfile.class.php
2019-02-27 13:26:37 +01:00
iouston
d1716babef
disable the auto renaming on upload
...
add a global variable for disable the auto renaming on upload file
corresponds to the request of this post : https://www.dolibarr.fr/forum/12-howto--aide/55094-fichiers-joints-decocher-la-case-sauver-sous#107392
2019-02-27 11:17:33 +01:00
atm-quentin
7f68750ec9
FIX blank space travis
2019-02-27 09:23:15 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +01:00
wdammak
64bd995978
Fix camelCase syntax and remove disabling of phpcs
2019-02-27 04:02:11 +01:00
Laurent Destailleur
401f587868
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_project.php
2019-02-27 02:27:33 +01:00
Laurent Destailleur
cbaa57b1e2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323
Merge pull request #10390 from glu000/8.0
...
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4
Merge pull request #10624 from frederic34/patch-2
...
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
94166c505b
Merge pull request #10690 from frederic34/patch-3
...
Update extrafields.class.php
2019-02-27 01:15:13 +01:00
Frédéric FRANCE
d608921f1e
add visibility
2019-02-26 23:15:28 +01:00
Frédéric FRANCE
242bf0ba49
Update html.formticket.class.php
2019-02-26 22:56:50 +01:00
Frédéric FRANCE
8b4e920d5e
add visibility
2019-02-26 22:42:19 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
wdammak
99fb702833
Add Select Establishment
2019-02-26 18:42:05 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Laurent Destailleur
5bcce53e40
Fix preselection when key is '0'
2019-02-26 12:20:22 +01:00
Laurent Destailleur
e0c7c32fae
Fix preselection when key is '0'
2019-02-26 11:44:44 +01:00
Laurent Destailleur
528bfca690
Fix preselection when key is '0'
2019-02-26 11:44:16 +01:00
Frédéric FRANCE
915841eeb9
wip
2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8
wip
2019-02-25 22:27:04 +01:00
Frédéric FRANCE
1e6ed94c5e
Update extrafields.class.php
...
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
2019-02-25 21:39:45 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
2019-02-24 20:53:54 +01:00
Laurent Destailleur
2eb48a6046
Merge pull request #10673 from frederic34/patch-3
...
Update extrafields.class.php
2019-02-24 20:43:44 +01:00
Laurent Destailleur
52bcef38fc
Merge pull request #10672 from frederic34/patch-1
...
Update html.formfile.class.php
2019-02-24 20:39:32 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Frédéric FRANCE
03714e4bed
Update extrafields.class.php
2019-02-24 09:17:45 +01:00
Frédéric FRANCE
042c6cc56e
Update html.formfile.class.php
2019-02-24 08:50:35 +01:00
Frédéric FRANCE
c7df326a91
replace html code by html5
2019-02-23 22:31:57 +01:00
Frédéric FRANCE
9dd58cf9ce
Update html.formfile.class.php
2019-02-23 16:52:26 +01:00
Laurent Destailleur
114cd5fa30
Merge pull request #10646 from grandoc/new_branch_21_02_2019
...
fix : When comparing two booleans, it is generally considered safer t…
2019-02-23 14:19:22 +01:00
Laurent Destailleur
50da34e26b
Merge pull request #10660 from frederic34/patch-22
...
Update html.formmail.class.php
2019-02-23 14:09:54 +01:00
Laurent Destailleur
fa45d2c5a9
Merge pull request #10657 from frederic34/patch-17
...
doc comment html.formfile.class.php
2019-02-23 14:09:42 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019
...
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Frédéric FRANCE
b75519fefe
Update html.formmail.class.php
2019-02-23 11:25:49 +01:00
Frédéric FRANCE
f7c0044e60
doc comment
2019-02-23 09:33:21 +01:00
Laurent Destailleur
5a18588bb7
CSS
2019-02-21 22:27:56 +01:00
Laurent Destailleur
2891758c23
FIX Stock visibility for service when option stock on service is on
...
NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2019-02-21 20:13:03 +01:00
Philippe GRAND
54da44b506
Translation
2019-02-21 19:50:03 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Philippe GRAND
047ec90d78
update with html5 compliant code
2019-02-19 17:38:14 +01:00
Laurent Destailleur
163db3d132
Code comment
2019-02-18 19:41:23 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
Laurent Destailleur
ad7b8371da
FIX Mark credit note as available for credit note in other currency
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802
FIX Mark credit note as available for credit note in other currency
2019-02-18 18:27:06 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00
Frédéric FRANCE
b017213131
selectMulticurrency avoid malformed empty value
2019-02-17 20:59:39 +01:00
Laurent Destailleur
a7af1b1765
Remove deprecated code
2019-02-14 16:29:13 +01:00
Laurent Destailleur
67c8ab47ea
Merge branch 'develop' into patch-21
2019-02-14 13:27:46 +01:00
Laurent Destailleur
518d42e309
Merge pull request #10572 from aspangaro/10.0_subledger
...
NEW: Add employee/user to subledger account list
2019-02-14 13:24:59 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Frédéric FRANCE
b18927a6c1
Update cunits.class.php
2019-02-13 23:13:48 +01:00
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit
2019-02-13 16:35:46 +01:00
Laurent Destailleur
534eac1a54
Merge pull request #10566 from frederic34/patch-17
...
Update rssparser.class.php
2019-02-13 16:24:45 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
Alexandre SPANGARO
4c8ee6950b
NEW: Add employee/user to subledger account list
...
With ACCOUNTANCY_COMBO_FOR_AUX
2019-02-13 09:41:44 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
Frédéric FRANCE
fa31f95356
Update rssparser.class.php
2019-02-12 23:31:21 +01:00
florian HENRY
eba4be2335
ad missing files
2019-02-12 17:03:47 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
f42d07d6da
Merge pull request #10529 from frederic34/patch-2
...
desactivate button on click to avoid multiple clicks
2019-02-12 13:12:30 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
c095f802dd
Dolibarrize module ticket
2019-02-11 14:51:59 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
2d4ccec309
Fix document generation of modulebuilder
2019-02-09 14:12:36 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Laurent Destailleur
5483856543
Fix phpcs
2019-02-08 23:53:40 +01:00
Laurent Destailleur
e2934a6b5f
Error message returned by old non "addreplace" hooks is propagated too
2019-02-08 19:38:52 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Frédéric FRANCE
f548a0ed79
desactivate button on click to avoid multiple clicks
2019-02-08 11:01:47 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
Laurent Destailleur
7334f02e5c
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
...
Dev defautselectcustomertype
2019-02-08 09:56:29 +01:00
florian HENRY
6ee5a9e2a6
fix travis
2019-02-07 12:21:33 +01:00
florian HENRY
3f20cae6d3
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +01:00
florian HENRY
95cc9faf7e
fix php warning
2019-02-06 09:01:24 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
410b291ad8
Fix quote not closed
2019-02-03 20:52:39 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
326996d392
Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound
...
psr2 end file new line none found
2019-02-03 19:04:28 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +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
Frédéric FRANCE
f83ee43a19
Merge branch 'develop' into nospaceaftercomma
2019-01-30 22:15:22 +01:00
Laurent Destailleur
c1f3f4c2b5
Fix: text for empty line not visible in select
2019-01-30 20:03:04 +01:00
Laurent Destailleur
200d30f2b9
Fix: text for empty line not visible in select
2019-01-30 20:01:55 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
3198f9fbbe
Merge pull request #10441 from aspangaro/10.0_email
...
Move my email to the new one
2019-01-30 14:59:58 +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
9ef93bceca
FIX last_main_doc var not saved
2019-01-29 18:40:47 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
b4400b95db
Merge pull request #10411 from BitKFu/develop
...
Added new calculation fields for the doc generator
2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102
Update commondocgenerator.class.php
2019-01-26 14:17:01 +01:00
Laurent Destailleur
59e993e834
Code comment
2019-01-25 12:03:07 +01:00
Gerhard Stephan
a78e406e76
Added new calculation fields for the doc generator
...
- object_total_up : Sum of all lines (subprice * qty)
- object_total_up_locale : Localized sum of all lines (subprice * qty)
- object_total_discount : Total discount in percent
- object_total_discount_locale : Localized total discount in percent
- line_total_up : Total sum of a line (subprice * qty)
- line_total_up_locale : Localized Total sum of a line (subprice * qty)
2019-01-24 21:08:13 +01:00
Laurent Destailleur
f9686c47af
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
Laurent Destailleur
8fba387673
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-22 10:39:18 +01:00
Laurent Destailleur
3cca0df28e
Support getFormatedCustomerRef into contract list
2019-01-22 10:39:06 +01:00
Günter Lukas
1cf786acff
Fix #10278
...
Fix #10278
2019-01-22 00:09:36 +01:00
Laurent Destailleur
eba8a8f34d
Merge pull request #10376 from atm-maxime/fix_extrafields_computed
...
Compute value of computed extrafield on fetch, not on show
2019-01-21 23:41:06 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc
2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc
more validation fixes
2019-01-21 16:19:31 +01:00
Laurent Destailleur
8950720fb5
NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods
2019-01-21 15:22:35 +01:00
Maxime Kohlhaas
23438b1f48
Compute extrafields after having set all others
2019-01-21 14:40:33 +01:00
Maxime Kohlhaas
f50de03585
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed
2019-01-21 14:36:23 +01:00
Maxime Kohlhaas
a2f5c72b54
Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed
2019-01-21 14:33:25 +01:00
torvista
07b2bb6715
Swap of align/valign/border/width for css
...
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019
...
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Maxime Kohlhaas
c0b0d5484c
Compute value of computed extrafield on fetch, not on show
2019-01-19 17:14:56 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Philippe GRAND
29fdad144d
update with html5 compliant code
2019-01-19 12:40:17 +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
wdammak
9f60c208ca
Update stats.class.php
...
Fix div/0 warnings
2019-01-18 22:25:51 +01:00
Laurent Destailleur
d6b0f852c5
Work on invoicing time spent
2019-01-15 21:01:01 +01:00
Laurent Destailleur
f8ca44e42c
NEW Preview of images into the filemanager component
2019-01-15 15:48:28 +01:00
Frédéric FRANCE
cf55b54cf5
correct list of links
2019-01-14 10:02:48 +01:00
Laurent Destailleur
d929d93376
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-08 14:19:35 +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
9a6c3ac3df
FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-08 14:05:07 +01:00
Laurent Destailleur
3d4879c538
Code comment
2019-01-06 05:16:50 +01:00
Laurent Destailleur
6e078105ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
c9e6074551
Code clean
2019-01-05 15:14:06 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +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
85d60b93d6
Update commonobject.class.php
2019-01-02 19:53:59 +01:00
Günter Lukas
2857447aee
Update commonobject.class.php
2018-12-30 00:20:38 +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
ldestailleur
2fef2b633a
FIX sql error when resetting payment mode / term
2018-12-28 23:13:39 +01:00
ldestailleur
8ad06463e0
FIX Can set payment mode to empty on thirdparty page
2018-12-28 23:06:04 +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
fb813fcfb1
Clean log
2018-12-27 06:06:32 +01:00
Laurent Destailleur
88ad059f25
FIX Bad trigger name
2018-12-27 06:04:55 +01:00
Laurent Destailleur
0ffefd71f3
Add log
2018-12-27 05:58:27 +01:00
Laurent Destailleur
eda3a5bc8c
FIX Init of email topic when using a template
2018-12-27 05:18:16 +01:00
Laurent Destailleur
0f76279a03
FIX Missing token and style
2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a
FIX Missing token and style
2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
35debd06fb
List of events show user firstname by default
2018-12-23 01:28:36 +01:00
Laurent Destailleur
6557dcfb81
CSS
2018-12-23 00:49:26 +01:00
Laurent Destailleur
da3d1ab8b8
CSS
2018-12-23 00:24:10 +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
a5dccd1cc3
Enable by default the test on anti CSRF token
2018-12-22 18:09:26 +01:00
Laurent Destailleur
6c54ea925b
Add token into confirm link so we will be able to check we accept the
...
confirmation on interface for critical actions
2018-12-22 17:42:33 +01:00
Laurent Destailleur
91f63f025b
Add rolling token into confirm url
2018-12-22 17:34:57 +01:00
Laurent Destailleur
33564ddafc
Fix css
2018-12-22 16:45:57 +01:00
Laurent Destailleur
7d1b48815d
Fix css
2018-12-22 11:57:23 +01:00
Regis Houssin
9b215e117a
FIX check if "entity" is already defined in "$param"
2018-12-21 11:23:44 +01:00
Laurent Destailleur
86502d881a
Merge pull request #10253 from grandoc/new_branch_18_12_2018
...
fix align issue
2018-12-19 13:02:25 +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
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +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
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
f2318716ec
FIX Error reported when creation of thirdparty from member fails
2018-12-18 21:27:16 +01:00
Philippe GRAND
7b84825d2b
fix align issue
2018-12-18 17:30:24 +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
e80e366fb1
Merge pull request #10187 from AlainRnet/patch-6
...
Update vcard.class.php
2018-12-15 15:59:34 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
0cbc0fa0fc
Fix shortkey
2018-12-14 19:33:43 +01:00
Laurent Destailleur
32f51838ec
Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys
...
NEW: Improve Displaying Access Keys in Navigation
2018-12-14 19:29:50 +01:00
Laurent Destailleur
d5bbb3033c
Update html.form.class.php
2018-12-14 19:29:15 +01:00
Laurent Destailleur
f9c06cdb82
FIX #9498 #10132
2018-12-14 19:04:17 +01:00
Laurent Destailleur
59bc15377d
CSS
2018-12-14 18:58:55 +01:00
Laurent Destailleur
0ac287c356
Merge pull request #10046 from frederic34/htmlformmail
...
reduce complexity of htmlformmail class
2018-12-14 17:37:34 +01:00
Laurent Destailleur
bd7df9869f
Update html.formmail.class.php
2018-12-14 17:37:08 +01:00
Laurent Destailleur
4dc32dafaa
Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook
...
NEW Add afterSelectContactOptions hook
2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0
Update html.form.class.php
2018-12-14 17:32:41 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer
...
fix scrunitizer
2018-12-14 17:28:34 +01:00
Laurent Destailleur
7665c368a2
Merge branch 'develop' into allow_ajax_search_on_product_desc
2018-12-14 17:24:52 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
59e38d4a81
Merge pull request #9897 from Vaadasch/develop
...
NEW Update working chkbxlst filter for lists
2018-12-14 15:33:50 +01:00
altatof
d5bf9691ee
allow product ajax search on description
2018-12-14 15:10:32 +01:00
Laurent Destailleur
dc4a122697
Merge pull request #10224 from fmarcet/develop
...
Qual: Better management of select type of lines
2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f
Merge pull request #9702 from bafbes/abb80027
...
New : Link to create new element on linked fields
2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334
Update commonobject.class.php
2018-12-14 11:01:27 +01:00
Laurent Destailleur
9bb3382002
Merge pull request #9534 from wdammak/patch-16
...
Add the ability to sort products by category
2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b
Update html.form.class.php
2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b
Fix scrutinizer
2018-12-14 09:58:23 +01:00
Laurent Destailleur
4fc2cefce3
Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report
...
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511
Update html.form.class.php
2018-12-13 20:51:45 +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
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
860492a19f
Merge pull request #10201 from joseplluis/patch-3
...
Fix: add ID property to select objects
2018-12-13 20:03:46 +01:00
Ferran Marcet
555698a3af
Qual: Better management of select type of lines
2018-12-13 10:36:30 +01:00
Philippe GRAND
58175b76f2
to avoid html issue
2018-12-12 12:17:28 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
3213b3be07
Standardize code: Move jabberid into social network module
2018-12-11 09:17:02 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Laurent Destailleur
af5b63954a
Clean code
2018-12-10 12:49:20 +01:00
Laurent Destailleur
3f912ebfff
FIX restore security event login/logout
2018-12-10 11:19:52 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Josep Lluís
1c9ccc1442
Fix: add ID property to select objects
...
Add ID property to select objects
I.e: id="select_'.$htmlname.'"
2018-12-07 17:28:31 +01:00
aljawaid
292dd5290a
Amend Add Access Keys in Navigation Tooltips
...
- Fix travis
2018-12-07 12:39:20 +00:00
AlainRnet
d8c600636c
Update vcard.class.php
...
update from vcard 2.1 to vcard 3.0
2018-12-06 00:26:54 +01:00
IJ
8bd2efe648
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
...
- Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off
2018-12-05 12:36:46 +00: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
Alexandre SPANGARO
3b8dd71816
Remove public $db
2018-12-03 21:25:44 +01:00
Alexandre SPANGARO
0c6f6b80cb
Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats
2018-12-03 21:16:53 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
07425e4e19
Merge pull request #10156 from grandoc/7.0_bug
...
FIX #3234
2018-12-02 17:06:06 +01:00
Alexandre SPANGARO
7eee155439
Correct documentation
2018-12-02 14:07:38 +01:00
IJ
30e84f8f2c
Amend Add Access Keys in Navigation Tooltips
...
- based on suggested code by @eldy
- Added `classfortooltip` for better display
2018-12-02 10:29:04 +00:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Philippe GRAND
8ec2bac36a
FIX #3234
2018-12-02 10:02:05 +01:00
Maxime Kohlhaas
ad05b531e7
Fix display user photo with new path
2018-12-02 00:02:43 +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
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
Maxime Kohlhaas
8c13c87429
Fix path for user photo
2018-12-01 16:55:42 +01:00
Inovea Conseil
18281d9d43
FIX #6580
...
FIX #6580
2018-12-01 16:48:50 +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
florian HENRY
faf7ea345f
fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0
2018-12-01 15:23:46 +01:00
florian HENRY
dacc959937
fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0
2018-12-01 15:18:51 +01:00
ATM John BOTELLA
c6f4879575
Fix issue from scrutinizer
2018-12-01 12:04:34 +01:00
Laurent Destailleur
c5bd11951f
Fix bar not visible on some screen
2018-11-29 02:09:07 +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
780a538fe0
Fix multicompany not accessible from website.
2018-11-27 17:37:39 +01:00
IJ
825f41bfda
Add Access Keys in Navigation Tooltips
2018-11-27 00:22:21 +00:00
Laurent Destailleur
f0ab6e60ec
FIX Loading translation of cron tasks
2018-11-26 13:31:05 +01:00
Laurent Destailleur
82b4b3ccb3
Merge pull request #10047 from frederic34/patch-9
...
doc cmail class
2018-11-24 11:20:49 +01:00
wdammak
5c9d5bb6ad
order by category
2018-11-23 21:30:34 +01:00
wdammak
5c3daf4a6a
order by category
2018-11-23 21:27:22 +01:00
wdammak
064816242a
Order by category
2018-11-23 21:26:10 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +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
Frédéric FRANCE
32706f570d
reduce complexity of htmlformmail class
2018-11-19 21:19:39 +01:00
Laurent Destailleur
e020597ba7
Fix deletion for class build with modulebuilder
2018-11-19 21:11:26 +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
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view
...
FIX hidden extrafield
2018-11-19 18:37:18 +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
4bedeabc5b
FIX #10036
2018-11-19 18:02:29 +01:00
François J
37f3b8bbde
Update @since version to 9.0
2018-11-19 17:51:00 +01:00
François J
6aaf0f4655
Add afterSelectOptions hook & selectcontacts context
2018-11-19 17:40:16 +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
atm-ph
129034ba76
Fix new params has been added not optional
2018-11-19 15:46:30 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php
2018-11-17 11:33:01 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +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
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +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
3ca45e0e40
Fix double dot in sql filename
2018-11-15 10:59:55 +01:00
John BOTELLA
c6cf748ba7
Fix envent message on upload category picture
2018-11-13 14:44:10 +01:00
John BOTELLA
500bb7bc96
best conditions testing
2018-11-13 10:20:34 +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
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
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
22170ac1c1
FIX Crop of large files was selecting wrong image area.
2018-11-08 10:45:39 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list
2018-11-07 21:51:05 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
John BOTELLA
4f7be36249
fix extrafield hidden
2018-11-07 09:14:29 +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
Laurent Destailleur
7e33af6677
Fix max size
2018-11-06 17:40:59 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +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
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
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
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
866729cd21
FIX bad link in notification
2018-10-30 22:32:42 +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
Marc de Lima Lucio
2fbc305683
FIX: task time screen: last fix was overkill
2018-10-30 16:00:56 +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
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
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
7a268d8d9f
Clean code
2018-10-30 14:27:14 +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
bddd658ba6
Merge pull request #9885 from frederic34/patch-15
...
code comment html form class
2018-10-30 12:27:19 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict
2018-10-30 12:26:37 +01:00
Vaadasch
0d7dbace63
Update extrafields.class.php
2018-10-30 07:20:42 +01:00
Vaadasch
a4c7787d8c
Update extrafields.class.php
2018-10-29 22:00:08 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Regis Houssin
977a88363e
FIX missing multidir_output for supplier modules
2018-10-29 12:50:40 +01:00
Regis Houssin
6e2d62bea6
FIX wrong entity id
2018-10-29 12:30:36 +01:00
Laurent Destailleur
08862fb482
Log success of emails
2018-10-29 03:25:21 +01:00
Laurent Destailleur
b4600fdc06
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/js/timesheet.js
2018-10-29 02:31:05 +01:00
Laurent Destailleur
04f80f0925
FIX Do not show check box if not applicable
2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465
FIX Selection of addmaindocfile is lost on error
2018-10-29 02:14:41 +01:00
Laurent Destailleur
6e3822345c
Fix use setup of template for attached files in mass actions
2018-10-29 02:14:31 +01:00
Laurent Destailleur
770f8c3f3b
FIX Selection of addmaindocfile is lost on error
2018-10-29 02:11:33 +01:00
Laurent Destailleur
f8a49edf78
Fix use setup of template for attached files in mass actions
2018-10-29 00:55:55 +01:00
Maxime Kohlhaas
b68b8fe412
Fix changing currency in a doc was recalculating amounts in company currency #9801
2018-10-28 11:02:51 +01:00
Vaadasch
2b91067966
Update working chkbxlst filter
...
Update line 1337 to make the filtering on chkbxlst working
2018-10-27 19:31:50 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
47ac420133
code comment html form class
2018-10-26 20:12:46 +02:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Laurent Destailleur
087b68948d
Fix: do not use point for graph with too many points.
2018-10-26 17:32:32 +02:00
Laurent Destailleur
4955ae03e8
Merge pull request #9867 from atm-john/develop_jflot
...
FIX hover stability and modernize style
2018-10-26 15:33:47 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
9ccdd10a81
FIXx format (html/text) of emails sent on leave request module
2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
atm-john
d0dc8b2a9c
Add points to lines charts and remove shadow to improve performances
2018-10-25 00:24:25 +02:00
atm-john
b5c47f16e6
Fix hover stability and modernize style
2018-10-24 23:25:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 13:31:31 +02:00
John BOTELLA
fccea99e23
FIX translation in select unit form
2018-10-24 10:23:27 +02:00
Laurent Destailleur
65a39269d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081
Fix phpcs
2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526
Fix code comment
2018-10-24 03:30:06 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf
2018-10-24 03:01:52 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
ddd267f4c3
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-24 02:21:53 +02:00
Laurent Destailleur
83dacf6290
Merge pull request #9845 from frederic34/patch-22
...
remove deprecated form_confirm
2018-10-24 02:06:54 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038
...
New : parameter for getnomurl in field specification
2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php
2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099
Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref
...
NEW hidden conf to search product by supplier ref
2018-10-24 01:48:17 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer
...
FIX/ADD missing print button for delivery form
2018-10-24 01:46:20 +02:00
atm-john
82f40fb4b9
NEW hidden conf to search by supplier ref
2018-10-23 23:21:30 +02:00
atm-john
0fe2c63bc0
FIX missing print button for delivery form
2018-10-23 22:11:39 +02:00
atm-quentin
04eb9ca167
fix dont change num version
2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
Abbes Bahfir
7e7473e7df
New : parameter for getnomurl in field dpecification
2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6
Fix:empty value instead of 0 for empty links
2018-10-23 00:03:34 +01:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php
2018-10-22 22:23:43 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php
2018-10-22 22:13:54 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf
2018-10-22 20:19:28 +02:00
Laurent Destailleur
bf46a35a31
Fix size of key for extrafield of type select
2018-10-22 19:05:04 +02:00
ATM-Nicolas
cf28e4e442
FIX : Variable name
2018-10-22 15:19:33 +02:00
Laurent Destailleur
4e6b21881f
Fix bug reported by scrutinizer
2018-10-21 12:14:20 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf
2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
897a2b09a7
Removed scrutinizer warning
2018-10-19 15:02:54 +02:00
Laurent Destailleur
e4b5cc154e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5
Fix regression in creating discount
2018-10-19 14:43:10 +02:00
Laurent Destailleur
4e82a6da46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18
...
Update menubase.class.php
2018-10-19 13:44:11 +02:00
Laurent Destailleur
762d82f2fe
Move declaration into common
2018-10-19 13:38:05 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15
...
Update html.formmail.class.php
2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9
...
add errors def to form class
2018-10-19 13:01:31 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt
...
add log and comment
2018-10-19 12:53:54 +02:00
Laurent Destailleur
696023c1aa
NEW Enhancement in the generic file manager
2018-10-19 12:47:59 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment
2018-10-18 21:47:10 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15
2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9
2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18
2018-10-18 20:39:45 +02:00
Laurent Destailleur
52840478c0
Clean code
2018-10-17 21:11:07 +02:00
gauthier
aea7299970
FIX : use discount with multicurrency
2018-10-17 15:49:08 +02:00
Laurent Destailleur
a66256a799
FIX Hover on the filemanager
2018-10-17 13:22:52 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php
2018-10-16 23:36:00 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php
2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php
2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class
2018-10-16 22:09:11 +02:00
Laurent Destailleur
f07096ea3a
Merge pull request #9760 from frederic34/patch-19
...
add errors def in htmlformsms
2018-10-16 20:01:41 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
atm-ph
72dd182b1f
Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields
2018-10-16 18:22:43 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Laurent Destailleur
70366e9d91
Missing translation
2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343
Fix missing es translation string
2018-10-16 03:30:17 +02:00
Frédéric FRANCE
9133d97e33
add errors def in htmlformsms
2018-10-15 21:40:27 +02:00
Laurent Destailleur
5d9b770511
phpcs
2018-10-15 13:32:09 +02:00
Philippe GRAND
995e9b4f55
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 12:16:57 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Philippe GRAND
f13c38e117
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-11 09:14:40 +02:00
atm-quentin
489ccc3c49
NEW list and fix conf
2018-10-10 12:19:57 +02:00
Laurent Destailleur
2b33e2a9c5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-10 10:52:58 +02:00
Laurent Destailleur
40f89d138f
Fix height of confirm popup
2018-10-10 10:52:29 +02:00
Philippe GRAND
90cb6150c4
Standardize and update code
2018-10-10 09:16:01 +02:00
Philippe GRAND
69379dc2bb
Standardize and update code
2018-10-10 09:12:25 +02:00
atm-quentin
7ad4a7e384
NEW creation facture fourn depuis reception
2018-10-09 16:26:40 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270
NEW Can filter on EEC, not EEC, etc... in binding step of accountancy
2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d
NEW The binding step in accountancy has a country filter like a combo
2018-10-09 01:03:46 +02:00
atm-quentin
c6ab79bad3
NEW note, contact and lines on card
2018-10-08 16:54:33 +02:00
Laurent Destailleur
0c7b7ed7f4
FIX Required extrafield value numeric should accept '0'
2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e
Fix translation of source of proposals
2018-10-08 14:04:22 +02:00
Abbes Bahfir
f0d8a5da9a
Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls
2018-10-08 12:39:59 +01:00
Abbes Bahfir
7d25311ce5
New : Link to create new element on linked fields
2018-10-08 10:59:01 +01:00
Laurent Destailleur
08ca85e995
Fix type
2018-10-08 02:19:32 +02:00
Laurent Destailleur
df7f218d01
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd
Fix regression into backup feature
2018-10-07 21:45:20 +02:00
Laurent Destailleur
ccc6dea85c
Merge pull request #9686 from frederic34/patch-11
...
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
2018-10-06 12:46:54 +02:00
Laurent Destailleur
f742b0f55b
Merge pull request #9685 from frederic34/patch-9
...
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
2018-10-06 12:39:30 +02:00
Philippe GRAND
61daff6cb6
Standardize code
2018-10-06 12:34:51 +02:00
Philippe GRAND
83db36f9b2
Standardize code
2018-10-06 12:11:48 +02:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Philippe GRAND
94df8d297d
Standardize code
2018-10-05 15:44:57 +02:00
Laurent Destailleur
4e84ed0e80
FIX Symbol of currency in substitution variables
2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1
FIX Symbol of currency in substitution variables
2018-10-05 13:58:38 +02:00
Frédéric FRANCE
2fc54ccf66
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
2018-10-04 20:23:58 +02:00
Frédéric FRANCE
48a063eca4
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
2018-10-04 20:18:24 +02:00
Laurent Destailleur
29cafc78d0
Merge pull request #9634 from grandoc/new_branch_29_09_2018
...
add some significant info within notification mail
2018-10-04 19:31:31 +02:00
Laurent Destailleur
4fad28d360
Update notify.class.php
2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944
Update notify.class.php
2018-10-04 19:30:03 +02:00
Laurent Destailleur
20f45db6b8
Merge pull request #9677 from grandoc/new_branch_04_10_2018
...
Standardize and update code
2018-10-04 18:33:24 +02:00
Laurent Destailleur
31916c94f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
34f1691302
Merge pull request #9655 from frederic34/patch-11
...
group same condition into one in html.formprojet.class.php
2018-10-04 17:15:15 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae
FIX Backup of database without mysqladmin available from cron.
2018-10-04 13:10:48 +02:00
Philippe GRAND
8bee69277d
Standardize and update code
2018-10-04 09:33:30 +02:00
Philippe GRAND
d2ec703b51
Standardize and update code
2018-10-04 09:24:57 +02:00
Laurent Destailleur
fd859d3162
Add a component to select lang into a web site
2018-10-03 18:40:54 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
2cd843acec
Fix separator too long
2018-10-03 16:02:42 +02:00
Frédéric FRANCE
e8cf59e6f6
Update html.formprojet.class.php
2018-10-01 21:03:33 +02:00
Laurent Destailleur
771922f427
Use 2 distinct left menu entries for leads and projects
2018-10-01 18:56:47 +02:00
Philippe GRAND
c22b80831d
fix regression
2018-10-01 17:14:28 +02:00
Philippe GRAND
0aae40f8aa
fix when there is no project
2018-10-01 17:05:52 +02:00
Philippe GRAND
b32a9cc50e
fix if no project linked
2018-10-01 09:13:02 +02:00
Laurent Destailleur
15780f71b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-01 03:22:20 +02:00
Laurent Destailleur
873f43db94
Uniformize interface for tickets
2018-10-01 03:19:21 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018
2018-10-01 02:20:16 +02:00
Laurent Destailleur
77dad1b32b
Merge pull request #9647 from frederic34/patch-17
...
indentation fix in commonobject class
2018-10-01 01:20:17 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018
...
Standardize and update code
2018-10-01 01:04:36 +02:00
Frédéric FRANCE
2af15ee932
Update commonobject.class.php
2018-09-30 17:59:04 +02:00
Philippe Grand
8acddb5bab
Update notify.class.php
2018-09-29 18:43:50 +02:00
Philippe Grand
9a2fd7defe
Update notify.class.php
2018-09-29 18:41:31 +02:00
Philippe GRAND
8ef9a301b3
add some significant info within notification mail
2018-09-29 14:51:52 +02:00
Laurent Destailleur
f667270d4d
Add option to not load all object and fix so linkedObjectsIds has same
...
content than linkedObjects
2018-09-28 17:38:29 +02:00
Philippe GRAND
15ff9f8917
Standardize and update code
2018-09-28 14:44:47 +02:00
Laurent Destailleur
224896a4dc
Code comments
2018-09-28 10:52:15 +02:00
Laurent Destailleur
c5a68d2462
Clean code
2018-09-28 10:51:55 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
291d477f65
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-09-27 12:47:48 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018
2018-09-27 09:42:58 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns
...
FIX: showOptionals: column mismatches
2018-09-27 09:39:51 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14
...
add try catch for swiftmailer
2018-09-27 09:34:21 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018
...
Add some code comment
2018-09-27 09:31:19 +02:00
Laurent Destailleur
e72dc26532
Merge pull request #9603 from atm-john/Fix_situation_invoice_selection
...
FIX previous situation invoice selection
2018-09-27 09:20:24 +02:00
Laurent Destailleur
b8ae88cf26
Merge pull request #9602 from grandoc/new_branch_24_09_2018
...
Standardize and update code
2018-09-27 09:19:59 +02:00
Laurent Destailleur
2b8ccc0c81
FIX Link template invoice to contract
2018-09-27 01:53:12 +02:00
Laurent Destailleur
9123329800
FIX Link template invoice to contract
2018-09-26 23:44:27 +02:00
Marc de Lima Lucio
af93fc7484
FIX: showOptionals: column mismatches
2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf
swiftmailer is doing encodetorfc2822
2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7
add try catch for swiftmailer
2018-09-26 10:13:14 +02:00
Laurent Destailleur
f2d53e80e5
Optimize performance of cron that rotate logs
2018-09-26 01:45:24 +02:00
Philippe GRAND
746d73b8e6
Add some code comment
2018-09-25 17:26:57 +02:00
atm-greg
4e4a6294f6
missing return
2018-09-25 15:18:10 +02:00
atm-greg
45bef65fc9
add hook on commongeneratedocument
2018-09-25 14:47:13 +02:00
Laurent Destailleur
515acbfee2
FIX Bad position of hook formattachOptions call
2018-09-25 11:46:42 +02:00
Frédéric FRANCE
d15c52db3b
Update rssparser.class.php
2018-09-25 08:16:05 +02:00
Laurent Destailleur
eeda176ed6
FIX Bad position of hook formattachOptions call
2018-09-24 15:13:18 +02:00
Philippe GRAND
d7df74656e
Standardize and update code
2018-09-24 12:03:49 +02:00
Philippe GRAND
ac31b79d9d
Standardize and update code
2018-09-24 11:58:01 +02:00
Philippe GRAND
1f2493f361
Standardize and update code
2018-09-24 11:45:34 +02:00
John BOTELLA
ceccd5a510
Fix prev situation invoice selection
2018-09-24 10:16:28 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018
...
Standardize and update code from New branch 20 09 2018
2018-09-23 15:35:42 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018
2018-09-21 10:12:48 +02:00
Philippe GRAND
e8b7ad0fb5
Standardize and update code
2018-09-21 08:49:05 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Philippe GRAND
67bbead7c1
Standardize and update code
2018-09-20 17:46:39 +02:00
Philippe GRAND
e1a03c49cf
Standardize and update code
2018-09-20 17:19:42 +02:00
Philippe GRAND
43edc64e7f
Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018
2018-09-20 16:57:10 +02:00
Laurent Destailleur
e0dfab4c71
FIX The max size for upload file was not corectly shown
2018-09-20 16:21:36 +02:00
Laurent Destailleur
c6470d49b0
FIX The max size for upload file was not corectly shown
2018-09-20 16:21:08 +02:00
Philippe GRAND
5979db7733
Standardize and update code
2018-09-20 12:07:23 +02:00
Laurent Destailleur
12b449fe49
It's easier to select fields to show on list
2018-09-19 16:41:33 +02:00
Laurent Destailleur
4580ed0b09
Fix bad link
2018-09-18 15:31:25 +02:00
Laurent Destailleur
b67392b016
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-18 15:18:16 +02:00
Laurent Destailleur
52b6dd16da
Standardize code
2018-09-18 15:18:07 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters
...
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
1c13fbb122
Merge pull request #9532 from frederic34/patch-17
...
reduce complexity of commoninvoice class
2018-09-18 15:03:25 +02:00
Philippe GRAND
cd796bf682
Standardize and update code
2018-09-17 12:29:21 +02:00
Philippe GRAND
484b36c5aa
Standardize and update code
2018-09-17 09:31:32 +02:00
Laurent Destailleur
0bf540b3c1
Fix regression in edition of date
2018-09-17 09:17:11 +02:00
wdammak
b17c44c665
Update html.form.class.php
...
Add the ability to sort products by category
2018-09-16 16:53:35 +01:00
Frédéric FRANCE
b950043618
trimParameters
2018-09-16 15:16:08 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php
2018-09-16 14:07:11 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Laurent Destailleur
10c6bc44ca
Fix scrutinizer
2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee
Remove warnings
2018-09-16 10:09:19 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Philippe Grand
1d82825afa
Update html.formsms.class.php
2018-09-15 21:34:55 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018
...
Standardize and update code
2018-09-15 17:30:14 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript
2018-09-15 17:01:23 +02:00
Laurent Destailleur
bbfe4462dc
NEW Add lib for multiselect with checkboxes
...
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Philippe GRAND
18f4755a90
Standardize and update code
2018-09-14 10:20:21 +02:00
John BOTELLA
ec23cd0da4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files
2018-09-14 09:54:14 +02:00
Philippe Grand
51ba970eaf
Update html.formsms.class.php
2018-09-14 09:33:16 +02:00
Philippe GRAND
3da762a59d
Standardize and update code
2018-09-13 15:06:06 +02:00
tarrsalah
08453a5337
FIX #9497
...
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
2018-09-13 11:04:11 +01:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
...
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464
...
Convert localized numeric extrafields value before inserting/updating
2018-09-12 19:06:43 +02:00
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
...
Selectbarcodetype
2018-09-12 19:02:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
358bc7ab1b
Merge pull request #9454 from frederic34/patch-16
...
Update dolreceiptprinter.class.php
2018-09-12 18:28:10 +02:00
Laurent Destailleur
64d99dd302
Merge pull request #9459 from frederic34/patch-18
...
Completely comment unused code
2018-09-12 18:21:51 +02:00
Philippe GRAND
69bf43f851
Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018
2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
53da80a79f
FIX Missing translation in predefined email to membership renewal
2018-09-12 12:55:10 +02:00
Jean-Marie Arsac
345c24990e
Correction of variable name
2018-09-11 20:51:54 +02:00
Jean-Marie Arsac
2f2dff8155
Convert localized numeric extrafields value before inserting
...
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
2018-09-11 14:57:31 +02:00
Philippe GRAND
b4cbb0561d
Standardize and update code
2018-09-11 10:36:39 +02:00
Frédéric FRANCE
2995208e5b
Completely comment unused code
2018-09-11 00:36:44 +02:00
Frédéric FRANCE
a36f41728f
deprecate formbarcode:form_barcode_type
2018-09-10 23:58:57 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Laurent Destailleur
d011204624
Fix switch of extrafields between all and only one entity
2018-09-10 17:36:46 +02:00
Frédéric FRANCE
2589b23464
Update dolreceiptprinter.class.php
2018-09-10 17:25:35 +02:00
Regis Houssin
43ac51b44c
FIX remove debug
2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062
FIX better compatibility with multicompany
2018-09-10 10:08:04 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
ac8f568604
replace select_date by selectDate
2018-09-08 12:47:27 +02:00
Frédéric FRANCE
cb97a29fc0
introduce seletDate
2018-09-08 12:00:11 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore
2018-09-06 21:27:18 +02:00
Philippe GRAND
97c740f510
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
2018-09-06 19:28:10 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore
2018-09-06 18:29:01 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 21:02:16 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore
2018-09-05 20:36:44 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +02:00
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore
2018-09-05 18:49:06 +02:00
Laurent Destailleur
cb89942bfb
Add option capture on input file for photo
2018-09-05 16:03:10 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore
2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore
2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore
2018-09-04 21:53:53 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore
2018-09-04 20:00:09 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop
2018-09-04 16:58:59 +02:00
Philippe GRAND
50a26aaf16
fix merge
2018-09-04 14:33:34 +02:00
Philippe GRAND
42565e722e
Standardize and update code
2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1
fix merge
2018-09-04 12:30:06 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
f2ec94e9fd
FIX #9353 Bug: html error - div inside span on graphs
2018-09-04 11:13:54 +02:00
Laurent Destailleur
c59b0f95e6
FIX #9403
2018-09-04 10:10:47 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore
2018-09-03 20:38:52 +02:00
Frédéric FRANCE
7288335c6d
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-03 19:01:11 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Regis Houssin
912c05774b
FIX remove deprecated triggers USER_LOG*
2018-09-03 09:30:36 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore
2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore
2018-09-02 23:44:53 +02:00
Frédéric FRANCE
47e73bfd8e
move phpcs:ignore
2018-09-02 23:01:14 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript
2018-09-02 19:00:43 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Laurent Destailleur
a68f5cad77
Fix syntax error
2018-09-02 17:18:19 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Laurent Destailleur
3d3edb19d8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
.travis.yml
2018-09-02 15:46:09 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore
2018-09-02 10:43:34 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject
2018-09-01 17:42:16 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Laurent Destailleur
2301ecf1dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:51:20 +02:00
Philippe GRAND
8d7dfaf98c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:49:42 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php
2018-09-01 14:41:44 +02:00
Laurent Destailleur
e4e1bf5a1a
Merge pull request #9361 from frederic34/patch-19
...
Update discount.class.php
2018-09-01 14:30:16 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
359eebbbec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5
...
NEW optional param to show a specific extrafield
2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4
Code comment
2018-09-01 14:24:02 +02:00
Philippe GRAND
7b47c79bc3
precise label comment
2018-09-01 14:06:58 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
06355f7f08
Merge pull request #9362 from frederic34/patch-20
...
Update ldap.class.php
2018-09-01 13:28:32 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Josep Lluís
78c0aa437f
NEW optional param to show a specific extrafield
...
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
2018-08-31 17:16:27 +02:00
atm-ph
102b698c76
Fix search company by code
2018-08-31 11:38:45 +02:00
Frédéric FRANCE
26c0244dbb
Update ldap.class.php
2018-08-30 23:13:16 +02:00
Frédéric FRANCE
4ad5201a16
Update discount.class.php
2018-08-30 23:10:09 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018
2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650
WTF...
2018-08-30 12:03:20 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2
...
last trimtrailing
2018-08-29 17:57:05 +02:00
Laurent Destailleur
7bf48b8d77
Fix date_start and date_end not saved on supplier invoice
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0
Fix date_start and date_end not saved on supplier invoice
2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Philippe GRAND
660f02f5a6
Fix white spaces
2018-08-29 12:35:56 +02:00
Philippe GRAND
32a9e35a6a
Fix white spaces
2018-08-29 12:31:36 +02:00
Philippe Grand
6fc813254b
Update html.formmail.class.php
2018-08-28 10:43:13 +02:00
Philippe Grand
b73fd487c0
Update ctyperesource.class.php
2018-08-28 10:41:54 +02:00
Philippe Grand
1856fb8946
Update ctyperesource.class.php
2018-08-28 10:41:26 +02:00
Philippe GRAND
65af8f902f
Update and standardize code
2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
9c6ce4b29d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
0a7ce338f9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
Frédéric FRANCE
faa29f9ae0
Update antivir.class.php
2018-08-28 01:34:42 +02:00
Laurent Destailleur
004b352e8e
Merge pull request #9279 from frederic34/patch-11
...
FIX Error message when sending a file with .virus extension
2018-08-28 01:26:04 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
Laurent Destailleur
e67e32c023
Add forcecombo on select language
2018-08-24 15:25:18 +02:00
Laurent Destailleur
b22d9db1a5
Fix tdclass
2018-08-24 15:18:19 +02:00
Laurent Destailleur
4885e61240
Fix tdclass
2018-08-24 15:16:03 +02:00
Laurent Destailleur
9f92974e98
Fix tdclass
2018-08-24 15:13:34 +02:00
Laurent Destailleur
32bde2c375
Add tdclass to form confirm for more control
2018-08-24 15:12:47 +02:00
Laurent Destailleur
d2a7c9976b
Fix syntax error
2018-08-24 15:05:57 +02:00
Laurent Destailleur
07407f46a7
Remove colspan
2018-08-24 15:02:19 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Philippe GRAND
215677c972
Standardize and update code
2018-08-23 18:17:09 +02:00
Philippe GRAND
74ce0bfea6
Standardize and update code
2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174
Standardize and update code
2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d
Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018
2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5
Update and standardize code
2018-08-23 11:11:46 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php
2018-08-23 09:57:19 +02:00
Philippe GRAND
504b0e3d16
Update and standardize code
2018-08-22 18:34:50 +02:00
Frédéric FRANCE
96f16b7497
Update commondocgenerator.class.php
2018-08-22 17:29:05 +02:00
Laurent Destailleur
b650f7ac17
Fix tab
2018-08-22 13:37:18 +02:00
Laurent Destailleur
c7a241a5db
FIX Get templates in a forced language
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2018-08-22 13:22:49 +02:00
Laurent Destailleur
c20d556265
FIX Get templates in a forced language
2018-08-22 13:16:55 +02:00
Frédéric FRANCE
d1d6d81f8f
Update antivir.class.php
2018-08-22 11:53:08 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895
Update and standardize code
2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Laurent Destailleur
3f4714416d
Clean comment
2018-08-21 18:58:10 +02:00
Laurent Destailleur
f8b3ec7b87
Fix PHPCS
2018-08-21 18:57:34 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
...
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
...
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
26d34422b0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-19 03:01:26 +02:00
Laurent Destailleur
795b2f3d58
FIX Delete file on smartphone
2018-08-19 03:00:11 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
...
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Frédéric FRANCE
5146ab9177
trim
2018-08-14 15:34:44 +02:00
Frédéric FRANCE
d25fa61998
return comment
2018-08-14 13:14:55 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
33f0172603
Fix select zip/town
2018-08-13 16:44:49 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-13 08:53:07 +02:00
Laurent Destailleur
6a8ed56c3d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/societe/canvas/actions_card_common.class.php
2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435
Fix firstname/lastname
2018-08-13 01:10:51 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price
...
NEW Add hook changeRoundingMode in update_price
2018-08-12 18:17:52 +02:00
Laurent Destailleur
3d4d42462c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Laurent Destailleur
2dbb6e258b
FIX Can filter on month in export of blockedlog
...
FIX Fingerprint correct in popup
2018-08-09 22:29:02 +02:00
florian HENRY
9024ed9e61
Merge branch '7.0' into 7.0_fhe
2018-08-09 17:47:21 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
Laurent Destailleur
d79778a67e
Fix reponsive
2018-08-08 17:00:16 +02:00
Juanjo Menent
948bb47040
Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption
...
NEW: Add option to display thirdparty adress in combolist
2018-08-08 11:14:22 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
gauthier
a2a8929d0e
NEW : tag odt line_product_ref_fourn for supplier doc lines
2018-08-07 11:45:56 +02:00
ATM-Nicolas
5b15e688af
FIX : PHP warning, undefined index notnull
2018-08-07 09:38:18 +02:00
florian HENRY
45a52a955e
NEW: Add optoin to display thirdparty adress in combolist
2018-08-06 10:52:10 +02:00
florian HENRY
0d85eb52c5
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534
fix bad use of test_sql_and_script_inject return int not value tested
2018-08-03 17:09:58 +02:00
atm-quentin
c97e2db089
Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price
2018-08-03 11:49:00 +02:00
atm-quentin
6662bf05ba
FIX hook on update price AND fix id on line
2018-08-03 11:47:43 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview
2018-08-02 18:43:55 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
gauthier
cadf931e8d
FIX : extrafieldkey
2018-07-31 15:02:51 +02:00
atm-quentin
37a4a0c488
fix for travis
2018-07-31 10:02:36 +02:00
Frédéric FRANCE
b90d125fda
trim trailing
2018-07-26 20:19:52 +02:00
Frédéric FRANCE
526ea496ee
trim trailing
2018-07-26 19:26:03 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing
2018-07-26 19:05:34 +02:00
Frédéric FRANCE
8312d95174
trim trailing
2018-07-26 18:22:16 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99
FIX project overview (can use any fields as fk_projet)
2018-07-26 15:05:32 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Laurent Destailleur
7e9a2c5ec7
Fix #9092
2018-07-24 17:06:41 +02:00
John BOTELLA
1e986bc39a
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)
2018-07-20 11:51:01 +02:00
Laurent Destailleur
508133b336
Clean code
2018-07-17 13:04:54 +02:00
Laurent Destailleur
f747cefda3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec
NEW Can enable a module, even external module, from command line
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-16 15:35:00 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06
Fix var not defined
2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266
Fix scrutinizer
2018-07-16 11:25:21 +02:00
Laurent Destailleur
e3d9e609d5
Fix var not defined
2018-07-16 11:20:54 +02:00
Laurent Destailleur
89cc048fff
FIX Init of contact in combo list when thirdparty not yet known
2018-07-16 10:46:10 +02:00
Laurent Destailleur
3710f95719
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21
Fix problem in some vars as reported in #8955
2018-07-16 09:57:45 +02:00
Philippe GRAND
9ae7e55fea
fix: breaking link
2018-07-13 19:54:37 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
699df860d8
Code comment
2018-07-09 15:39:59 +02:00
Laurent Destailleur
e427496ddf
FIX Injection
2018-07-09 14:13:01 +02:00
Laurent Destailleur
d3d1b6d513
NEW Can enable a module, even external module, from command line
2018-07-09 13:02:01 +02:00
Regis Houssin
e8afd7e833
Fix: use "supplier" instead "reseller"
2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/loan/index.php
2018-07-06 16:09:32 +02:00
Laurent Destailleur
2a676b414a
Merge pull request #9024 from atm-maxime/fix_link_create_event
...
Fix link to create event had no socid if from thirdparty card
2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57
Update html.formactions.class.php
2018-07-06 14:26:21 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
BENKE Charlene
633bf3034f
new add total price on dashboard
2018-07-05 11:52:58 +02:00
ATM-Nicolas
59220c05e4
FIX : Select first mail model by default
2018-07-05 11:18:28 +02:00
Laurent Destailleur
f7b8e09268
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0
Fix travis
2018-07-03 13:49:41 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
7ef6b16d31
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/step1.php
2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-03 10:01:30 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany
...
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
dc69960b00
Code comment
2018-07-02 12:17:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Regis Houssin
9709207a4f
Fix: superadmin can show all users in master entity
2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c
Fix: better sql request with multicompany transverse mode
2018-07-02 10:09:56 +02:00
Regis Houssin
233ad2945c
Fix: missing hook parameter
2018-07-01 20:03:08 +02:00
Regis Houssin
f13dd9c9bd
Fix: missing hook parameter
2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15
Fix: wrong mysql resource name
2018-07-01 17:48:01 +02:00
Regis Houssin
df55bee8ae
Fix: missing "$disableremove" global
2018-07-01 15:33:10 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist
...
NEW support selllist in the module builder
2018-06-30 15:33:17 +02:00
Regis Houssin
62a55e10b7
Fix: remove not used list template
2018-06-30 10:58:28 +02:00
Regis Houssin
3a26443546
Fix: remove unused code
...
Conflicts:
htdocs/product/list.php
2018-06-30 10:53:40 +02:00
Laurent Destailleur
f6774de773
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 02:00:46 +02:00
Laurent Destailleur
c6b650a7bb
Merge pull request #8789 from defrance/patch-116
...
NEW Add CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY and CONTRACT_HIDE_UNSELECTABLES by SELECT_HIDE_UNSELECTABLES
2018-06-30 01:23:09 +02:00
Laurent Destailleur
292d7967c3
Merge pull request #9021 from grandoc/8.0
...
Fix : Notice: A non well formed numeric value encountered line 509
2018-06-29 20:02:54 +02:00
Laurent Destailleur
9004a51880
Update conf.class.php
2018-06-29 20:02:40 +02:00
Laurent Destailleur
4ace9dd12d
Merge pull request #9015 from hregis/8.0_bug
...
Fix: remove unused and blocking field
2018-06-29 19:58:25 +02:00
Laurent Destailleur
2175a012e1
Fix lang
2018-06-29 18:23:59 +02:00
Regis Houssin
2d13b5b59d
Fix: broken feature with edit in place
2018-06-29 15:57:34 +02:00
atm-ph
41a516f1c4
New parameter to transform select into multiselect
2018-06-29 11:48:54 +02:00
Laurent Destailleur
20c72c1ae4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/main.inc.php
2018-06-29 00:22:15 +02:00
Laurent Destailleur
198deb92f6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-29 00:09:12 +02:00
Laurent Destailleur
66f0ee9e18
Fix hack with hook to solve a problem to let a chance of external
...
modules to be visible to android webview.
2018-06-28 22:59:53 +02:00
Laurent Destailleur
60c62895bf
WIP Can add tooltips on extrafields
2018-06-28 19:13:23 +02:00
Maxime Kohlhaas
5756955d55
Fix link to create event had no socid if from thirdparty card
2018-06-28 14:27:59 +02:00
Philippe GRAND
a4ccb47b78
Fix : Notice: A non well formed numeric value encountered line 509
2018-06-28 12:18:03 +02:00
Laurent Destailleur
055d818069
FIX dashboard with IE10 not supporting flex
2018-06-28 12:09:13 +02:00
Laurent Destailleur
6fc6a743c8
Fix template email message html/nohtml
2018-06-27 12:11:49 +02:00
Laurent Destailleur
9eaca045e4
Fix default message with online payment link must be hidden when no
...
online payment mode exists.
2018-06-27 11:34:40 +02:00
Regis Houssin
775e11ce33
Fix: wrong table name
2018-06-27 09:33:09 +02:00
Laurent Destailleur
ac758e02a9
Fix error message with old usage of childtables
2018-06-27 01:32:54 +02:00
Laurent Destailleur
8147152ec8
Fix look and feel v8
2018-06-26 11:25:28 +02:00
John
008163628a
New pdf documents using new column system
2018-06-26 08:03:25 +02:00
Laurent Destailleur
cbe682582e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
97976fbb43
Fix type of parameter must be string
2018-06-25 09:19:45 +02:00
Regis Houssin
a6729b0bd1
Fix: change field name and remove obsolete data
2018-06-25 09:10:24 +02:00
Laurent Destailleur
25b1d063ae
Fix length of hidden password
2018-06-24 11:45:10 +02:00
Laurent Destailleur
00165871bd
CSS
2018-06-23 15:10:44 +02:00
Laurent Destailleur
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
88d3bf0148
FIX creation of tasks must hide closed project
2018-06-21 18:47:02 +02:00
Laurent Destailleur
75dee7538b
Fix add protection to avoir fatal error 500
2018-06-19 01:15:37 +02:00
Laurent Destailleur
5d5083199f
FIX better text content for multipart email
2018-06-18 23:26:21 +02:00
Laurent Destailleur
f9f7d3655d
FIX better text content for multipart email
2018-06-18 23:24:31 +02:00
Laurent Destailleur
c3f64ed36e
FIX better text content for multipart email
2018-06-18 23:18:22 +02:00
Laurent Destailleur
7c7ee56832
Fix missing email
...
Fix avoid warning
2018-06-17 01:50:10 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
e18717aa85
Update html.formprojet.class.php
2018-06-13 22:12:16 +02:00
Laurent Destailleur
933a6a5ba3
Update html.formcontract.class.php
2018-06-13 22:11:44 +02:00
Laurent Destailleur
4b84b7ccf2
Merge pull request #8926 from fappels/develop_fix_setvaluefrom
...
FIX commonobject setValueFrom trigger
2018-06-13 20:50:26 +02:00
Laurent Destailleur
03b6bec8b8
Fix email template for test
2018-06-13 17:03:46 +02:00
Laurent Destailleur
cfa69fe93f
FIX popup confirmation deos not accept value with special chars
2018-06-13 14:51:20 +02:00
Laurent Destailleur
50aa674ebc
Fix support of 'help' field property. Fix bad td closing.
2018-06-13 13:36:40 +02:00
Laurent Destailleur
f4bef82bfa
Fix td not closed and js code duplicated (at wrong place)
2018-06-13 13:00:08 +02:00
Laurent Destailleur
5ae1395acd
Fix js when no data
2018-06-11 14:22:01 +02:00
Laurent Destailleur
485dc9a57a
Clean code
2018-06-08 15:37:25 +02:00
Laurent Destailleur
929a44d7ca
Fix dir of contract for multicompany
2018-06-06 23:56:59 +02:00
Laurent Destailleur
d10c9cf565
FIX dir for modules must not have s at end (fix contracts into contract)
2018-06-06 23:47:48 +02:00
fappels
a9f60bcdac
fix travis
2018-06-06 22:04:12 +02:00
fappels
81ef355b65
Fix trigger on setValueFrom
...
Load updated values into object for trigger.
2018-06-06 17:10:46 +02:00
gauthier
45ecb0258b
FIX : entity test must be on product_fourn_price table and not product table
2018-06-05 12:41:38 +02:00
Laurent Destailleur
8d62c06653
css
2018-06-05 11:25:41 +02:00
Laurent Destailleur
b6955692b4
Fix autofill of password
2018-06-05 11:22:00 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
5ff3398048
Try to fix evil Google Chrome autopopulate bug
2018-06-01 18:27:17 +02:00
Laurent Destailleur
b094ae953e
Better log
2018-06-01 17:20:49 +02:00
Laurent Destailleur
7eea70ebc8
FIX #8858 #8860 Backport better compatibility fix
2018-05-29 10:13:34 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4
Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist
2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc
Fix Show double(x,y) fields
2018-05-26 23:39:36 +02:00
Laurent Destailleur
10281169e6
Empty page first
2018-05-25 15:43:08 +02:00
Laurent Destailleur
b246034670
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-25 14:57:43 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty
...
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
bcbe28d802
Code comment
2018-05-25 12:48:33 +02:00
Laurent Destailleur
f3713844ee
Update commonobject.class.php
2018-05-25 12:38:01 +02:00
Laurent Destailleur
770e97431b
Update commonobject.class.php
2018-05-25 12:36:38 +02:00
Laurent Destailleur
86b1904a41
Update commonobject.class.php
2018-05-25 12:33:30 +02:00
Laurent Destailleur
aa65b3f9ba
Merge pull request #8830 from wdammak/patch-8
...
Add liste_modeles to warehouse module
2018-05-25 11:43:48 +02:00
Laurent Destailleur
3d71ce8297
Update html.formfile.class.php
2018-05-25 11:19:38 +02:00
Laurent Destailleur
520ce99e56
Merge pull request #8828 from bgenere/develop
...
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298
Update commonobject.class.php
2018-05-25 11:17:01 +02:00
Laurent Destailleur
22b1f2574e
Merge pull request #8851 from atm-florian/develop
...
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined
2018-05-25 11:07:18 +02:00
Laurent Destailleur
ac0570f6b2
Update translate.class.php
2018-05-25 11:07:11 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody
...
Add table thead and tbody for object lines
2018-05-25 10:42:26 +02:00
delcroix Patrick
3158fdc551
Update commonobject.class.php
2018-05-24 21:20:34 +02:00
Laurent Destailleur
e51aa68284
Fix link to warehouses for events
2018-05-24 12:16:04 +02:00
florian HENRY
436a1001b3
fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL
...
on upgrade.php page where global is not yet defined
2018-05-24 10:56:01 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty
2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-23 17:05:08 +02:00
delcroix Patrick
c85d216f8e
Merge branch 'develop' into patch-modulebuilder-supportsellist
2018-05-22 22:24:20 +02:00
patrick Delcroix
29d26b6e89
New: support sellist in modulebuilder
2018-05-22 22:16:25 +02:00
patrick Delcroix
2ccaf1ad95
New: support sellist in modulebuilder
2018-05-22 22:00:20 +02:00
Laurent Destailleur
354198b31e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/contact.php
2018-05-22 20:26:09 +02:00
Laurent Destailleur
f074daae48
Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT
2018-05-22 20:17:31 +02:00
Laurent Destailleur
2a579b707a
FIX javascript showempty error
...
FIX Contact tab not visible when using canvas
2018-05-22 19:43:28 +02:00
wdammak
1f43882bb7
Add liste_modeles to warehouse module
2018-05-22 01:09:52 +01:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Laurent Destailleur
1b20ec05d1
Save translation
2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff
Fix missing lang
2018-05-21 19:35:12 +02:00
bgenere
227539d647
FIX : showOptionals function is now consistent with template
...
Extrafield_view.tpl.php for date and datetime fields
The jdate function is not called when not needed.
2018-05-21 16:55:35 +02:00
Laurent Destailleur
6d0306f75a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-05-18 11:52:48 +02:00
Laurent Destailleur
492b1e7169
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-05-18 11:48:08 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation
...
Add credit note compatibility with situation invoice.
2018-05-18 11:34:10 +02:00
Laurent Destailleur
a279451241
Fix can use actionmsg for generic trigger
2018-05-17 17:58:29 +02:00
John
8710cf570d
Add table thead and tbody for object lines
2018-05-17 16:52:16 +02:00
John
b01893d536
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull
2018-05-16 15:29:57 +02:00
Laurent Destailleur
ad32b3098a
Too verbose log
2018-05-16 10:31:44 +02:00
BENKE Charlene
4bebc8149b
Update html.formcontract.class.php
2018-05-13 21:17:15 +02:00
BENKE Charlene
f4af9ec22f
Update html.formcontract.class.php
2018-05-13 19:38:30 +02:00
BENKE Charlene
b0757916c4
Update html.formcontract.class.php
2018-05-13 16:59:03 +02:00
BENKE Charlene
2f1800f3e2
Update html.formprojet.class.php
2018-05-13 15:34:26 +02:00
BENKE Charlene
537048a10a
Update html.formcontract.class.php
2018-05-13 15:30:32 +02:00
Laurent Destailleur
a2d485c14f
Fix management of enabled property extrafields
2018-05-13 14:27:40 +02:00
Laurent Destailleur
302d9399e2
Fix search when using special char
2018-05-13 12:42:16 +02:00
Laurent Destailleur
53b5733fb4
Fix test
2018-05-12 13:40:53 +02:00
Laurent Destailleur
ee11a46a66
Merge pull request #8766 from fmarcet/develop
...
NEW Add Date delivery and Availability on Propals List
2018-05-10 12:18:27 +02:00
Laurent Destailleur
d020741173
Merge pull request #8757 from bafbes/abb7004
...
New : Translate list elements in journal selection
2018-05-10 12:15:34 +02:00
Laurent Destailleur
0bf1fe2908
Merge pull request #8753 from delcroip/patch-15
...
new: log message for missing translation
2018-05-10 11:56:56 +02:00
Laurent Destailleur
f476e3e304
Update translate.class.php
2018-05-10 11:56:49 +02:00
Laurent Destailleur
842c6168a2
FIX #8762
2018-05-10 11:50:35 +02:00
Laurent Destailleur
56b80d81dd
Declare hook as addreplace hook
2018-05-10 11:39:29 +02:00
Ferran Marcet
70527e64c5
New: Add Date delivery and Availability on Propals List
2018-05-08 18:15:02 +02:00
Abbes Bahfir
fd9b6365a7
New : Translate list element in journal selection
2018-05-07 09:20:19 +01:00
delcroix Patrick
5ac2b51517
new: log message for missing traduction
...
It's often difficult to find out the missing translation
2018-05-06 17:29:30 +02:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
2018-05-05 14:34:54 +02:00
TuxGasy
12440e6a7e
Do not display multicurrency cols if currency of object is same as main currency
2018-05-02 11:30:35 +02:00
Laurent Destailleur
cb76d2ce0f
Better logging
2018-05-01 18:58:19 +02:00
florian HENRY
b5d7206519
fix 6.0 accountancy multientity
2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary"
2018-05-01 11:17:47 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
4c12369a26
Debug module ticket
2018-04-30 10:33:36 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383
Fix: use "socpeople" instead "societe"
2018-04-27 10:42:10 +02:00
Laurent Destailleur
659fd46b76
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array
...
NEW: work on CommonObject 'array' field typeNew common object array
2018-04-27 09:39:26 +02:00
Laurent Destailleur
36616cdd50
FIX When time is entered without hour, edit keeps this
2018-04-26 10:07:27 +02:00
Laurent Destailleur
21a18da43b
We can disable the "favorites" in select combo of countries
2018-04-25 21:06:51 +02:00
Laurent Destailleur
9d070cac87
NEW Can add product in supplier order/invoice even w/o predefined price
...
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805
fix commonobject double style
2018-04-24 12:33:07 +02:00
Laurent Destailleur
fb8ad77378
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34
FIX extrafields price and double were lost during a failed post.
2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937
FIX extrafields price and double were lost during a failed post.
2018-04-23 22:53:57 +02:00
Laurent Destailleur
e9a2894727
Fix PSR2
2018-04-22 20:59:29 +02:00
Laurent Destailleur
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Philippe GRAND
410d1ee07d
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-21 12:05:50 +02:00
Laurent Destailleur
cca4b1cbf5
NEW Optimize load of hooks classes (save 1-5Kb of memory)
2018-04-21 11:24:45 +02:00
Philippe GRAND
be600690cd
Fix : Bad value for modulepart
2018-04-20 16:47:49 +02:00
Marc de Lima Lucio
39e890e2d7
FIX: handle non-js users
2018-04-20 16:43:27 +02:00
Marc de Lima Lucio
2bf66780cb
FIX: travis + code readability
2018-04-20 16:38:52 +02:00
Marc de Lima Lucio
41a0727481
NEW: work on CommonObject 'array' field type
2018-04-20 16:38:52 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Laurent Destailleur
6b90558b7a
FIX File name not visible in email preview
2018-04-20 11:20:56 +02:00
Laurent Destailleur
5f43ff3609
Fix no pitco if bank account not defined
2018-04-20 08:47:53 +02:00
Laurent Destailleur
bbd1257222
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-20 01:50:08 +02:00
Laurent Destailleur
e621daa61d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-20 01:47:54 +02:00
Laurent Destailleur
7a703e149f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-20 01:39:48 +02:00
Laurent Destailleur
c6a53ca25d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/supplier_proposal/card.php
2018-04-20 01:39:26 +02:00
Laurent Destailleur
c10c962d3a
Merge pull request #8624 from inoveaconseil/patch-1
...
NEW add any predefined mail content
2018-04-20 01:31:37 +02:00
Laurent Destailleur
54154343b2
Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default
...
FIX: CommonObject: don't require 'notnull' field if 'default' set
2018-04-20 01:28:00 +02:00
Laurent Destailleur
2f19ba11e5
Merge pull request #8637 from hregis/develop_ticket
...
Fix: dolibarrize
2018-04-20 01:22:19 +02:00
Laurent Destailleur
558bda5f27
Fix translation of extrafields
2018-04-19 17:45:00 +02:00
Regis Houssin
5b79b76685
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ticket
Conflicts:
htdocs/core/class/html.formticketsup.class.php
2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f
Debug ticketsup
2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195
Debug ticket module
2018-04-19 14:44:21 +02:00
Marc de Lima Lucio
893ce55852
FIX: commonobject: don't require notnull field if default set
2018-04-19 10:29:48 +02:00
Laurent Destailleur
41be1c3d3d
Removed deprecated class (method setCookie already exists for that)
2018-04-19 10:22:08 +02:00
florian HENRY
882863ab48
fix : define in conf dir_output for suipplier_proposal modules
2018-04-18 16:21:20 +02:00
Marc de Lima Lucio
e88830820a
FIX: dont print empty date in CommonObject::showOutputField
2018-04-18 11:13:18 +02:00
Regis Houssin
ff76e60c49
Fix: some bugs and warnings
2018-04-18 10:13:20 +02:00
Regis Houssin
d841abd55a
Fix: missing value when reload
2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9
Fix: dolibarrize
2018-04-18 09:27:54 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44
Look and feel v8
2018-04-18 02:10:23 +02:00
Inovea Conseil
d032280a96
NEW add any predefined mail content
2018-04-17 16:03:12 +02:00
Laurent Destailleur
2135365e0a
Bug new extrafields architecture
2018-04-17 14:44:55 +02:00
Laurent Destailleur
7bb8078b46
Fix translation of extrafields
2018-04-17 13:52:50 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a
NEW Can sort order of files in attach tab for leave and expensereport
2018-04-16 19:25:27 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Philippe GRAND
0a6bcb2a39
fix typo and translation
2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402
fix typo
2018-04-15 07:07:04 +02:00
Laurent Destailleur
a0e243a29b
Clean code
2018-04-13 23:11:19 +02:00
Laurent Destailleur
3b202b2255
Merge branch 'develop' into develop_bug5
2018-04-13 22:23:14 +02:00
Laurent Destailleur
6f91b8019f
Remove warnings
2018-04-13 17:54:27 +02:00
Laurent Destailleur
4251748aca
Clean code
2018-04-13 16:18:33 +02:00
Laurent Destailleur
77a853e49d
Fix remove warning
2018-04-13 14:53:40 +02:00
Laurent Destailleur
9f5eed0c9a
Code comment
2018-04-13 14:12:31 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4
Clean code
2018-04-13 13:11:07 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226
Fix: avoid Warning: Creating default object from empty value
2018-04-13 11:20:21 +02:00
Laurent Destailleur
78fcbe9633
FIX the extrafields separator was not translated
2018-04-13 10:48:29 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
ace55ba569
Debug usage of extrafields for ticket module
2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
...
FIX: various modulebuilder-related issues
2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17
Update html.form.class.php
2018-04-11 18:00:34 +02:00
Laurent Destailleur
afdd504e16
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/journal/sellsjournal.php
2018-04-11 17:58:21 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser
...
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity
...
Fix extrafield entity query filter
2018-04-11 17:31:36 +02:00
Laurent Destailleur
e4f2e0ecbd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
2018-04-11 17:20:49 +02:00
Laurent Destailleur
c70e0c1cda
FIX #8475 #8540
2018-04-11 17:14:34 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php
2018-04-11 16:27:56 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement
...
FIX: payment term doc-specific label was not used (issue #8414 )
2018-04-11 14:52:06 +02:00
Laurent Destailleur
f54113b1a1
Merge pull request #8524 from frederic34/patch-10
...
FIX do not fill error with success message when using SwiftMailer
2018-04-11 13:19:04 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby
...
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830 )
2018-04-11 13:18:10 +02:00
Marc de Lima Lucio
c966cdbd47
FIX: selectForFormsList: entity checked even is object not multi-entity managed
2018-04-11 11:43:51 +02:00
John
96e26100f0
Add extrafield entity query filter
2018-04-11 11:27:47 +02:00
Laurent Destailleur
f181719769
Can fetch a companypaymentmode of a thirdparty
2018-04-10 18:11:08 +02:00
ATM-Nicolas
47d5b1f6fd
FIX : update wrong datetime extrafield
2018-04-10 16:39:28 +02:00
Marc de Lima Lucio
7aa4d16eef
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked
2018-04-10 16:23:56 +02:00
Laurent Destailleur
0bf4381226
NEW The field "visible" on extrafield can accept expression as condition
2018-04-10 15:39:11 +02:00
Marc de Lima Lucio
1fd5dba118
FIX: payment term doc-specific label was not used
2018-04-10 15:24:57 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
John
63180f45a8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-09 09:17:26 +02:00
Frédéric FRANCE
f5b49aa93b
do not fill error with success message
2018-04-09 00:21:29 +02:00
Laurent Destailleur
259f3b3020
Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP
2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934
Code comment
2018-04-07 13:04:52 +02:00
Laurent Destailleur
85d4f7115b
Better position of the substitution tooltip for emails
2018-04-06 16:16:08 +02:00
Laurent Destailleur
9ce5d02fde
Merge pull request #8517 from bafbes/master700
...
define module part to include external modules menus
2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4
Update conf.class.php
2018-04-06 11:25:48 +02:00
Laurent Destailleur
658e1224d1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda
...
FIX: img_pictos for remove assigned user in agenda card
2018-04-05 16:42:40 +02:00
bahfir abbes
16ae46e64c
define module part to include external modules menus
2018-04-05 15:23:17 +01:00
Laurent Destailleur
dd934c89bf
Merge pull request #8507 from frederic34/patch-2
...
Translation of error message
2018-04-05 16:12:36 +02:00
Laurent Destailleur
533de639ae
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-05 13:25:59 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
2b135dc951
FIX #8488
2018-04-05 13:13:45 +02:00
Regis Houssin
5914bfdf18
Fix: more complete
2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9
Fix: backward compatibility
2018-04-05 13:00:50 +02:00
florian HENRY
cc0fb830b8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-04-05 10:53:17 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php
2018-04-04 15:58:24 +02:00
John
ce24ca08ee
move list of situation table and fix credit note display
2018-04-04 12:33:48 +02:00
John
b7681e7249
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a
img_picto must return fullpath to picto.png
2018-04-03 12:23:26 +01:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8
Restore broken confirmation popup
2018-03-31 23:39:08 +02:00
Laurent Destailleur
d21143831c
Clean code
2018-03-31 22:44:32 +02:00
Laurent Destailleur
96c73a13f6
Clean code
2018-03-31 16:45:36 +02:00
Laurent Destailleur
84bb4c6ad7
FIX With x extrafields, request for multicompany label was done x times
2018-03-30 19:51:53 +02:00
Laurent Destailleur
0978c8f58b
CSS
2018-03-29 16:07:49 +02:00
Laurent Destailleur
a214d0b3d7
Merge pull request #8461 from hregis/develop_multicompany
...
Fix: best visibility of choices
2018-03-29 13:58:30 +02:00
florian HENRY
cc7deb0add
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826
better error management
2018-03-29 09:35:47 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
125085acee
Fix name of method to avoid ci errors
2018-03-29 03:01:05 +02:00
florian HENRY
7635f23d78
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-03-27 18:39:56 +02:00
