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

5505 Commits

Author SHA1 Message Date
Laurent Destailleur
1ba716b82c Fix do not allow use of second or third tax without using 1st one. 2018-10-25 14:39:54 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +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
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +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
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents 
NEW hidden option to define an invoice template for each invoice type
 2018-10-14 16:36:37 +02:00
Philippe GRAND
9551cb12f5 Standardize and update code 2018-10-13 09:59:33 +02:00
atm-quentin
4b23b46e48 NEW workflow set reception billed on validate supplier bill 2018-10-11 14:49:19 +02:00
jfefe
8fc4e2066f FIX : position 0 for emails templates 
Closes #9548 #8737 #9478
 2018-10-10 18:18:02 +02:00
atm-greg
2d395b23c4 fix for travis 2018-10-10 14:35:25 +02:00
atm-greg
6eeb860514 delete useless code 2018-10-10 14:09:38 +02:00
atm-greg
24988f075c Add archive generation for documents directory 2018-10-10 14:01:20 +02:00
atm-quentin
489ccc3c49 NEW list and fix conf 2018-10-10 12:19:57 +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
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
b61f3b4313 Look and feel v8 2018-10-07 17:31:35 +02:00
Philippe GRAND
5583211246 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +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
16aef0e9fc
Merge pull request #9651 from frederic34/patch-9 
fix td filecheck
 2018-10-04 17:09:46 +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
atm-quentin
00f532c436 validation modèle de données 2018-10-04 09:50:39 +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
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
John BOTELLA
af66a8971a NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT 2018-10-02 15:51:17 +02:00
Frédéric FRANCE
96139d88a4
fix td filecheck 2018-10-01 13:45:17 +02:00
Alexandre SPANGARO
14627abb27 FIX Title problem on admin RSS module 2018-10-01 01:14:43 +02:00
Alexandre SPANGARO
825f774b53 FIX Title problem on admin RSS module 2018-09-29 15:28:03 +02:00
Laurent Destailleur
851fd4cc18 NEW Can set the default focus of each page. 
NEW Can set if a field is mandatory on form level.
 2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830 Work on mandatory form fields 2018-09-27 16:38:18 +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
96c1814793 FIX XSS vulnerability reported by Mary Princy E 2018-09-27 11:33:28 +02:00
Laurent Destailleur
df64961c6b FIX nb of session in title 2018-09-24 21:56:57 +02:00
Laurent Destailleur
8aa22f2c33 NEW Add option to swap sender/recipient address on PDF 2018-09-23 14:57:44 +02:00
Laurent Destailleur
a078951a94 Add an help for user to avoid bad configuration 2018-09-21 11:12:08 +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
Laurent Destailleur
b421c29ea7 FIX #9510 2018-09-20 19:20:15 +02:00
Laurent Destailleur
d35687c8b3 Work on module social network 2018-09-19 01:45:56 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Laurent Destailleur
e2e3354807 Clean code 2018-09-18 16:35:38 +02:00
Laurent Destailleur
1a1219ee2a Trans 2018-09-18 14:52:50 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
98f26bfcfb NEW Can set 2 url in url field of thirdparty 2018-09-17 14:31:30 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing 
printing remove no camelcaps function
 2018-09-15 17:29:21 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function 2018-09-13 11:13:32 +02: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
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
6291f18179
Merge pull request #9440 from frederic34/patch-5 
Upper Lower Casing
 2018-09-12 18:24:02 +02:00
Laurent Destailleur
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre 
remove deprecated
 2018-09-12 18:23:24 +02:00
Laurent Destailleur
da37302dc2
Merge pull request #9437 from grandoc/new_branch_08_09_2018 
New branch 08 09 2018
 2018-09-12 17:29:33 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type 2018-09-10 23:50:48 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated 2018-09-09 15:52:55 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
863886a621
Update salaries.php 2018-09-08 23:19:56 +02:00
Philippe GRAND
a6b25093e7 Standardize and update code 2018-09-08 12:57:11 +02:00
Philippe GRAND
c65505fdca Standardize clean and update code 2018-09-08 12:24:10 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
572eb35167 Standardize and update code 2018-09-08 10:30:10 +02:00
Philippe GRAND
035b2be2eb Standardize and update call to langs 2018-09-07 14:58:22 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-06 21:28:30 +02:00
Laurent Destailleur
c5695db3e4 NEW Can disable meteo on smartphone only 2018-09-06 11:09:51 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +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
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore 2018-09-02 14:01:37 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +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
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Frédéric FRANCE
945eede4a5
doxygen fixs 2018-08-31 23:12:55 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing 2018-08-31 21:39:23 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
6ca9854a34 Fix to avoid fetch when no accounting account defined 2018-08-29 21:07:00 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +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
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Laurent Destailleur
de2cdfc70f FIX Language selection lost if error during creation of email template 2018-08-22 13:23:46 +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
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
1b1258b2ef Fix url in tooltip 2018-08-16 11:19:22 +02:00
Laurent Destailleur
71c1d2275b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-16 11:18:18 +02:00
Laurent Destailleur
bbd19010d0 Fix url in tooltip 2018-08-16 11:18:03 +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
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
5146ab9177
trim 2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +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
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +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
d79778a67e Fix reponsive 2018-08-08 17:00:16 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +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
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Regis Houssin
20a1ffe810 FIX field is autoincrement but not "rowid" 2018-07-24 12:15:54 +02:00
Laurent Destailleur
ccd7332647 Fix default value of joinfile when creating a new email template 2018-07-24 01:46:14 +02:00
Philippe GRAND
3297554102 clean and update code 2018-07-23 17:45:38 +02:00
Laurent Destailleur
e9fccec055 Fix website deletion 2018-07-22 16:56:11 +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
35ed89a517 Fix scrutinizer 2018-07-16 10:11:52 +02:00
Laurent Destailleur
1e775ffa6e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301 Fix phpcs 2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
b203421ac6 Fix log 2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5 Some fix with dolistore api 2018-07-11 10:47:55 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +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
8184eff66c Fix for #9079 2018-07-09 15:25:14 +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
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +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
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113 
introduce serial and document for holiday module
 2018-06-30 02:09:28 +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
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop 
ajout de la gestion des comptes bancaires des tiers via l'api
 2018-06-30 01:26:08 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop 
NEW: ADD url to see the last version of a external module
 2018-06-30 01:17:10 +02:00
Laurent Destailleur
fba9caab5d
Merge pull request #8944 from bafbes/abb7008 
New: Option to see line numbers in modules page
 2018-06-29 20:05:19 +02:00
Laurent Destailleur
75e9f1bf9a
Update modules.php 2018-06-29 20:05:12 +02:00
STAGIAIRE-PC\Pierre
19eaa3df66 ajout de la modification dans la base de données 2018-06-27 11:29:46 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500 adding the possibility to personnalize ent_to_end and ustrd of a bank levy 2018-06-27 10:53:45 +02:00
Regis Houssin
48ad03c56d Fix: remove unused and blocking field 2018-06-27 09:33:21 +02:00
Laurent Destailleur
9f1cfbdb72
For better compatibility 2018-06-25 12:25:43 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Laurent Destailleur
2520ebcfae Fix line 2018-06-24 18:56:49 +02:00
Philippe GRAND
41a0175827 clean and upsdate code 2018-06-18 14:17:43 +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
03b6bec8b8 Fix email template for test 2018-06-13 17:03:46 +02:00
Abbes Bahfir
74d92dd91f New: Optiopn to see line numbers in modules page 2018-06-11 23:10:40 +01:00
gauthier
baf9d4a806 FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def. 2018-06-08 17:11:59 +02:00
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Laurent Destailleur
7cb66e8e0c Fix reset of filters 2018-06-05 10:04:57 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Inovea Conseil
0f9fa09d3f
Fix after the comment 2018-05-31 09:13:18 +02:00
Mavyre
e59a91bdae
Stopped using AJAX for the synchro 2018-05-30 21:12:28 +02:00
Inovea Conseil
e0c1e33012 NEW: ADD url to see the last version of a external module 2018-05-30 00:20:31 +02:00
Frédéric FRANCE
67e0abdd66
loadlangs 2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs 2018-05-26 18:41:16 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02: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
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +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
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018 
clean and update code
 2018-05-18 12:20:22 +02:00
John
05bb98f4c0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-05-16 11:49:37 +02:00
Laurent Destailleur
d52305cef8 NEW Add entry for the GDPR contact 2018-05-15 11:50:42 +02:00
Laurent Destailleur
94ccb44673 Fix bad url wor external subscription page 2018-05-12 11:02:44 +02:00
Philippe GRAND
edbe32ea0c clean and update code 2018-05-11 22:31:17 +02:00
Philippe GRAND
e5d8dec2f9 clean and update code 2018-05-11 12:18:45 +02:00
BENKE Charlene
e3963c3518
Create holiday.php 2018-05-07 22:48:43 +02:00
Laurent Destailleur
95bd249ec6
Merge pull request #8740 from grandoc/new_branch_04_05_2018 
Clean and update code
 2018-05-05 13:49:54 +02:00
Laurent Destailleur
e9008e9461
Merge pull request #8734 from grandoc/new_branch_03_05_2018 
clean and update code
 2018-05-05 13:28:47 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
Philippe GRAND
b5f222f45a Clean and update code 2018-05-04 14:14:04 +02:00
Philippe GRAND
f3a70a40d7 clean and update code 2018-05-03 21:27:52 +02:00
Laurent Destailleur
24518803fc Clean code 2018-05-02 19:15:16 +02:00
Laurent Destailleur
dfe6e4bfc1 Doxygen 2018-05-02 19:08:59 +02:00
Laurent Destailleur
2f2d17926d Sort list 2018-05-01 20:52:25 +02:00
Laurent Destailleur
c3b5664fb5 Fix sort order of email templates 2018-05-01 16:24:40 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Laurent Destailleur
c376cc5779
Merge pull request #8686 from grandoc/new_branch_26_04_2018 
clean code
 2018-04-27 11:39:32 +02:00
Laurent Destailleur
cee4df9b27
Merge pull request #8667 from grandoc/new_branch_23_04_2018 
clean code
 2018-04-27 09:46:55 +02:00
Laurent Destailleur
69db960a92 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/activity/perweek.php
 2018-04-26 18:33:02 +02:00
Philippe GRAND
966419254d clean code 2018-04-26 15:44:15 +02:00
Philippe GRAND
502c837e04 Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018 2018-04-26 15:36:15 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Philippe GRAND
458dc42692 clean and update code 2018-04-25 11:50:58 +02:00
Philippe GRAND
c22ef109ac clean and add new code 2018-04-24 17:42:13 +02:00
Philippe GRAND
bf1e5bc618 Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018 2018-04-24 17:31:10 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Philippe GRAND
9e9d52a662 clean and update code 2018-04-23 16:23:30 +02:00
Philippe GRAND
bcf5c5d78a clean code 2018-04-23 16:04:52 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop 
New: Add same parameters on 'printFieldListTitle' hooks
 2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141
Merge pull request #8648 from grandoc/new_branch_20_04_2018 
clean and update code
 2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +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
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Philippe GRAND
53efccd98e Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-20 16:46:53 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Philippe GRAND
1ebdcae538 clean and update code 2018-04-20 11:30:40 +02:00
Philippe GRAND
33505411a7 clean and update code 2018-04-20 11:17:45 +02:00
Ferran Marcet
6ced1a3264 New: Add same parameters on 'printFieldListTitle' hooks 2018-04-20 10:38:16 +02:00
Laurent Destailleur
788fd62205
Merge pull request #8636 from hregis/develop_pgsql 
Fix: avoid Warning: A non-numeric value encountered + wrong var name
 2018-04-20 01:20:19 +02:00
Laurent Destailleur
16e27a445b Sort type of email template combo list 2018-04-19 20:42:03 +02:00
Laurent Destailleur
17dd96ef31 Fix filter on email template 2018-04-19 20:17:54 +02:00
Laurent Destailleur
1389ce9e48 FIX Template of modules not enabled must not be visible 2018-04-19 20:12:43 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Laurent Destailleur
8aab183567 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-19 14:00:18 +02:00
Laurent Destailleur
6b3e5e2085 FIX sanitize setup params 2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a FIX CVE-2018-10092 2018-04-18 11:58:36 +02:00
Regis Houssin
eaecf7190a Fix: avoid Warning: A non-numeric value encountered + wrong var name 2018-04-18 08:34:48 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
77b686500c css 2018-04-14 21:07:20 +02:00
Laurent Destailleur
ecfabc6633 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-13 23:18:39 +02:00
Laurent Destailleur
32ff8ae132 Fix link 2018-04-13 18:02:25 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +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
ea35a445a1
Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
John
24bf8cb162 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-04-09 16:21:37 +02:00
Laurent Destailleur
aa01afc0d5 Fix direct link on transifex using new search url 2018-04-09 13:57:09 +02:00
Laurent Destailleur
0475cb8018 FIX Permission for bookkeeper 2018-04-09 10:51:58 +02:00
Laurent Destailleur
6529043182 Clean code 2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Alexandre SPANGARO
741a14993a NEW Add file number in accountant card and update export filename 2018-04-07 06:21:49 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
b412f0b76b Better interaction to setup email 2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm 
NEW: send mails from project card
 2018-04-05 16:39:06 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6 
FIX limit access of email template page to internal users
 2018-04-05 16:11:04 +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
1b1a8f7e81 Fix trigger name 2018-04-05 13:21:00 +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
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Regis Houssin
c720345e6d Fix: better test 2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
3aff363998 NEW: mail templates for projects 2018-03-28 17:08:26 +02:00
Laurent Destailleur
8102ae6705 Work on setup for vat of product payments 2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750 More logical setup behavior 2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
Laurent Destailleur
7272ee806e Fix field not mandatory 2018-03-19 12:55:13 +01:00
Laurent Destailleur
ae17ce6f9a NEW Add a tab to specify accountant/auditor of the company 2018-03-19 12:52:09 +01:00
Alexandre SPANGARO
93b087dbe0 NEW Add a tab to specify accountant/auditor of the company 2018-03-18 06:09:50 +01:00
Laurent Destailleur
ba47b6d051 NEW Add tab contact on supplier proposals 2018-03-16 10:21:53 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Frédéric FRANCE
ad05ddfe5c
Update ticketsup_extrafields.php 2018-03-11 20:42:39 +01:00
Frédéric FRANCE
111bbd98ce
Update ticketsup.php 2018-03-11 20:36:52 +01:00
Regis Houssin
ecb44e2f53 Fix: wrong copy/paste 2018-03-11 18:57:36 +01:00
Regis Houssin
7c3984c9db Fix: dolibarrizzzz 2018-03-11 18:54:38 +01:00
Regis Houssin
741d69fabe Fix: dolibarrize 2018-03-11 18:23:02 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer 
Add dkim signing with Swiftmailer
 2018-03-10 18:48:08 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241 
7.0 fix8241
 2018-03-09 22:47:43 +01:00
Laurent Destailleur
40d04482b0 Fix set time 2018-03-09 22:45:16 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
4d885310c7
Merge pull request #8311 from inoveaconseil/patch-1 
Fix set time limit to 0
 2018-03-09 22:41:15 +01:00
florian HENRY
bb8525614c better fix 2018-03-09 19:37:39 +01:00
Inovea Conseil
d763bfcbf1
Fix set time limit to 0 
If the dolibarr was installed on a pc and not on server or in the doliwamp.
 2018-03-09 17:56:49 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
c1c6720edc Fix look and feel v7 2018-03-07 12:27:31 +01:00
Laurent Destailleur
f597e08d06
Merge branch 'develop' into 8.0-a6_vat 2018-03-07 12:23:43 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
fab007ad83 Remove deprecated option dolibarr_pdf_force_fpdf 
Fix view of dolibarr setup config file
 2018-03-07 09:41:27 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Alexandre SPANGARO
4a46ffc5d8 Add information in VAT admin page 2018-03-06 05:02:09 +01:00
Laurent Destailleur
951babae6d
Merge pull request #8272 from aspangaro/7.0 
Fix : Missing language file
 2018-03-05 20:44:34 +01:00
Laurent Destailleur
f35679fb2a Fix description of field of table 2018-03-05 13:11:07 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Alexandre SPANGARO
c0664474e4 Fix : Missing language file 2018-03-04 06:32:55 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:22:15 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +01:00
Laurent Destailleur
f545d2a134 NEW Can add filter actiontype and notactiontype on event ical export 2018-02-28 20:06:28 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
7e48db2869 Clean code 2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
f7ecac8734 Fix look and feel v7 2018-02-23 11:40:56 +01:00
Laurent Destailleur
b3d968d4a1 Fix look and feel v7 2018-02-23 11:40:20 +01:00
John
d0ef8fe75a fix travis errors 2018-02-22 09:54:36 +01:00
John
629b8e618e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-02-21 11:45:23 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
John
46b235c139 add auto select model when select type on create invoice 2018-02-20 15:08:57 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
Laurent Destailleur
e25bd56e22 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:16:06 +01:00
Laurent Destailleur
ec66bde3c9 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:15:24 +01:00
Rui Strecht
fd594f7e74 Fixed wrong global 2018-02-07 16:57:43 +00:00
Rui Strecht
f52beef3eb Added translation to company.php if MAIN_SHOW_REGION_IN_STATE_SELECT is activated 2018-02-07 16:54:21 +00:00
Rui Strecht
8c732a1443 Trying to not include sql request into method setMysoc 2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948 Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/core/class/commonobject.class.php
 2018-02-06 10:26:38 +00:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
Rui Strecht
b387c3fdf8 Forgot to update other files to same PR changes 2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2018-01-31 11:19:39 +00:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user 
NEW export filter models can be share or not by user
 2018-01-29 21:19:50 +01:00
Laurent Destailleur
a639308601 Fix css 2018-01-27 19:40:16 +01:00
Laurent Destailleur
28417a6c24 Fix css 2018-01-26 23:54:45 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer 2018-01-25 22:03:51 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year. 
Fix date are nto humanly readable.
 2018-01-25 12:57:36 +01:00
Laurent Destailleur
dfc7d47747 Fix message 2018-01-21 15:32:10 +01:00
atm-quentin
c2ee92d4f1 fix trans 2018-01-18 13:59:05 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
cc5dcde9e1 Fix protection to avoid errors 2018-01-14 18:55:55 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu 
fix #7963
 2018-01-11 00:44:45 +01:00
florian HENRY
0bd45dc64b fix: search translation into external module files also 2018-01-10 20:34:32 +01:00
Laurent Destailleur
bc9fc2828a Fix missing class 2018-01-10 10:42:36 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
Laurent Destailleur
da4417dfc8 Fix website in multicompany mode 2018-01-07 18:33:20 +01:00
Maxime Kohlhaas
a9c7dc48ab New option to force e-mail recipient, helpful for test purposes 2017-12-24 17:31:31 +01:00
Laurent Destailleur
e839c72109 Fix css 2017-12-22 14:05:49 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
9f2a42b67d NEW Can filter on user on unalterable log 2017-12-16 21:50:58 +01:00
Laurent Destailleur
2163db446b NEW Can test signature of a version from API 2017-12-16 17:24:23 +01:00
Laurent Destailleur
1a3fbc092d Fix method not found 2017-12-15 17:07:32 +01:00
Laurent Destailleur
5af153550d Debug blockedlog: 
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
 2017-12-15 16:56:08 +01:00
Laurent Destailleur
fb0169cbb8 Back link to module page 2017-12-15 10:46:11 +01:00
Laurent Destailleur
2eea3a1afa Fix backlink of module setup pages 2017-12-15 10:36:35 +01:00
Laurent Destailleur
dbefb93e0f Error management 2017-12-11 18:25:23 +01:00
Laurent Destailleur
bb7c03906e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/societe/list.php
 2017-12-11 15:25:09 +01:00
Laurent Destailleur
f2e429e28f Fix file integrity checker (exclude files excluded from package) 2017-12-11 15:03:34 +01:00
Laurent Destailleur
4443c0f0a0 Fix style 2017-12-10 15:24:47 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
alexis Algoud
62cd77d999 NEW automatic activation of external module on country set 2017-12-08 10:13:03 +01:00
alexis Algoud
a2df87ab15 NEW warning on module blocked log reset if country code is FR 
fix wrong paste click
 2017-12-05 11:40:42 +01:00
Laurent Destailleur
081d31a56e Debug php backup for new mysql version 2017-12-03 11:45:34 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
39fdd1b37d Use correct link to changelog 2017-11-30 11:16:28 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search 
factorization of extrafields into list
 2017-11-28 12:14:47 +01:00
Laurent Destailleur
8954d52e32 Fix edit dictionary 2017-11-27 16:07:48 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer
aab2799981 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-11-27 13:48:36 +00:00
Laurent Destailleur
69725fe62f Fix setup of direct print with google docs driver 2017-11-27 13:55:27 +01:00
Laurent Destailleur
a48fe55832 Fix language file of external module not visible in trans tool 2017-11-25 22:53:58 +01:00
Laurent Destailleur
5935ad868a Fix the from robot must be visible only on test page 2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb The form to test email can now use all sending profiles. 2017-11-25 18:52:47 +01:00
Laurent Destailleur
a529725c5c Fix lang code must be null if not defined 2017-11-25 17:42:46 +01:00
Laurent Destailleur
88841ccbae FIX #7590 2017-11-25 01:58:11 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
657d1137c0 Disable field if overwrite transaction is off 2017-11-23 09:49:15 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
07c0b5d616 Code comment 2017-11-15 13:15:08 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Laurent Destailleur
31e152274c NEW Add 2 new automatic classification in workflow module 2017-11-14 01:00:57 +01:00
Laurent Destailleur
15fc8ce33b Fix responsive on agenda setup page 2017-11-12 14:02:27 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
2fe831db63
Merge pull request #7779 from atm-maxime/new_dict_filter_country 
New dictionnaries are now pre-filtered on company country
 2017-11-11 17:30:26 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
9d3cf8f217 Fix can use tooltip with popup even for column titles 2017-11-09 18:50:15 +01:00
Maxime Kohlhaas
82ea46c740 New dictionnaries are now pre-filtered on company country 2017-11-07 10:49:04 +01:00
Philippe GRAND
acc69b1f80 fix : Warning: A non-numeric value encountered 2017-11-03 19:52:02 +01:00
Laurent Destailleur
5f5c7a9126 NEW Show user id of web process in system info - web server 2017-11-03 11:42:24 +01:00
Laurent Destailleur
608f87d03b Set focus on first field to fill. 2017-11-02 16:14:24 +01:00
Laurent Destailleur
a6879775bb FIX Search into language is ok for file into external modules two. 2017-11-01 20:05:28 +01:00
Laurent Destailleur
e184cac2c5 FIX Search into language is ok for file into external modules two. 2017-11-01 19:58:46 +01:00
Laurent Destailleur
2094ae1a57 NEW Add filter on event code on automatic filling setup page 2017-10-31 19:28:34 +01:00
Laurent Destailleur
bd94ec0f1d Use fontawesome for picto for on/off default. 2017-10-31 12:25:06 +01:00
Laurent Destailleur
29bb0b37ef Translation 2017-10-31 11:50:56 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
Laurent Destailleur
007783cf76 FIX Searching translation should not be case sensitive 2017-10-30 01:45:39 +01:00
Laurent Destailleur
9edc8f6eb6 FIX Searching translation should not be case sensitive 2017-10-30 01:32:17 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
1adfc02724 Fix hook not visible when using old syntax 2017-10-27 10:05:21 +02:00
Laurent Destailleur
3accb9d658 Fix warning 2017-10-26 03:35:57 +02:00
Laurent Destailleur
9f0f5eb5e8 Fix translation of extrafields type 2017-10-24 18:05:43 +02:00
Laurent Destailleur
4d4f1ab6ec Fix html entities 2017-10-24 10:09:20 +02:00
Laurent Destailleur
e257da6b19 Reload of menu auguria done when required 2017-10-24 09:47:18 +02:00
Laurent Destailleur
605c9c45e4 Merge pull request #7656 from atm-maxime/fix_accounting_mode 
Fix #7584
 2017-10-22 02:21:53 +02:00
Laurent Destailleur
4c58e4f98a Update compta.php 2017-10-22 02:21:34 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00
Maxime Kohlhaas
4224ea6c56 Fix use conf instead of global var 2017-10-18 19:09:29 +02:00
Laurent Destailleur
6bcdf2ff75 Test replacement of img switcher with FA css 2017-10-17 14:03:22 +02:00
Laurent Destailleur
3a97a3e2ad Move key "Translation" into main file. 
Add direct link to edit on transifex
 2017-10-17 13:05:55 +02:00
Laurent Destailleur
5b880cf45f Merge pull request #7645 from frederic34/transedit 
enhance admin translation
 2017-10-17 11:48:19 +02:00
Frédéric FRANCE
23e2c95af6 enhance admin translation 2017-10-16 21:22:13 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Rui Strecht
447cc208fe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/societe/class/societe.class.php
 2017-10-16 09:34:24 +01:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
56be9e2b60 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +02:00
Laurent Destailleur
2759e2552e Merge pull request #7609 from dolibarr95/patch-24 
Update : Add class in module list table
 2017-10-11 11:53:33 +02:00
dolibarr95
220b37133b Wrong test 
https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587
 2017-10-11 11:49:46 +02:00
Laurent Destailleur
acc83db220 Merge pull request #7605 from dolibarr95/patch-22 
Fix : Wrong test in technical services provided
 2017-10-11 11:49:18 +02:00
dolibarr95
0abc16b27f Add class 
Add oddeven class to tr tag
 2017-10-10 14:55:42 +02:00
dolibarr95
7943a14fa2 Wrong test 
https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587
 2017-10-10 09:43:03 +02:00
Laurent Destailleur
0b7aa20464 Add link to ChangeLog 2017-10-09 22:52:26 +02:00