Laurent Destailleur
|
8091cff009
|
Can edit param of operation for email collector
|
2019-04-29 15:44:16 +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 |
|
Laurent Destailleur
|
10dde837d0
|
Debug email collector
|
2019-04-25 19:32:48 +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 |
|
ATM john
|
684879d73c
|
apply appli btn to more elements
|
2019-04-16 21:49:26 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Laurent Destailleur
|
d728af9ced
|
Add the test for ckeditor with mode "inline" in setup page of ckeditor
|
2019-04-12 17:44:22 +02:00 |
|
Laurent Destailleur
|
cf058e7d3b
|
NEW Ask date of invoice when using the Clone feature.
|
2019-04-12 12:12:08 +02:00 |
|
Laurent Destailleur
|
203cbd56c2
|
Finished debug of emailcollector module
|
2019-04-10 17:35:33 +02:00 |
|
Laurent Destailleur
|
05c14e4f2f
|
Look and feel v10
|
2019-04-10 15:54:29 +02:00 |
|
Laurent Destailleur
|
2eeb4b8734
|
Debug ticket module
|
2019-04-10 15:45:55 +02:00 |
|
Laurent Destailleur
|
26594fab98
|
Debug module ticket
|
2019-04-10 15:11:38 +02:00 |
|
Laurent Destailleur
|
ff629b2355
|
NEW Color for hover and for checked line is on by default
|
2019-04-09 15:57:26 +02:00 |
|
Laurent Destailleur
|
f9860e1425
|
Work on email collector
|
2019-04-09 13:23:30 +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
|
22ca858b36
|
Enhance setup of email collector
|
2019-04-07 18:32:01 +02:00 |
|
Laurent Destailleur
|
fad2fa48dd
|
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
|
2019-04-07 15:44:17 +02:00 |
|
Laurent Destailleur
|
0091b65a83
|
Fix phpcs
|
2019-04-01 18:10:14 +02:00 |
|
Laurent Destailleur
|
c959c8b645
|
Fix api with prestashop
|
2019-03-31 18:21:00 +02:00 |
|
Laurent Destailleur
|
ecd049b4e6
|
Debug dolistore
|
2019-03-31 13:39:51 +02:00 |
|
Laurent Destailleur
|
bb2545c7b4
|
Clean code
|
2019-03-31 13:05:35 +02:00 |
|
Laurent Destailleur
|
b10682e5db
|
Fix search in dolistore
|
2019-03-31 13:03:38 +02:00 |
|
Laurent Destailleur
|
fca404e8d5
|
Show price without tax to prepare tax per customer country.
|
2019-03-30 19:30:58 +01:00 |
|
Laurent Destailleur
|
67c207db12
|
NEW Better explanation for setup of WebDav module
|
2019-03-30 11:58:49 +01:00 |
|
Laurent Destailleur
|
80f7cef0a8
|
Better translation
|
2019-03-28 09:20:05 +01:00 |
|
Laurent Destailleur
|
d8212d84df
|
Debug emailcollector
|
2019-03-26 19:15:18 +01:00 |
|
Laurent Destailleur
|
f991d4ba99
|
Fix typo
|
2019-03-26 18:10:28 +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
|
1787b31932
|
FIX setup of module export
|
2019-03-26 12:18:28 +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
|
a16b6daa92
|
Look and feel v10
|
2019-03-24 16:10:03 +01:00 |
|
Laurent Destailleur
|
77843ddeba
|
Allow use of log file or not for debugbar
|
2019-03-23 14:50:28 +01:00 |
|
Laurent Destailleur
|
df9e121ac6
|
Enhance the module debugbar. Do not scan the log anymore.
|
2019-03-23 14:37:54 +01:00 |
|
Laurent Destailleur
|
805493f43d
|
Merge pull request #10894 from grandoc/new_branch_20_03_2019
update with html5 compliant code
|
2019-03-21 18:23:40 +01:00 |
|
Philippe GRAND
|
e17ab64dbd
|
update with html5 compliant code
|
2019-03-20 09:56:17 +01:00 |
|
Philippe GRAND
|
569be67317
|
update with html5 compliant code
|
2019-03-20 09:55:34 +01:00 |
|
Philippe GRAND
|
dee46173ff
|
update with html5 compliant code
|
2019-03-20 09:53:29 +01:00 |
|
Philippe GRAND
|
5e6b451195
|
update with html5 compliant code
|
2019-03-20 09:52:33 +01:00 |
|
Philippe GRAND
|
963847c89c
|
update with html5 compliant code
|
2019-03-20 09:49:38 +01:00 |
|
Philippe GRAND
|
644743dce8
|
update with html5 compliant code
|
2019-03-20 09:47:06 +01:00 |
|
Philippe GRAND
|
427a3fc02d
|
update with html5 compliant code
|
2019-03-20 09:35:16 +01:00 |
|
Philippe GRAND
|
819253abee
|
update with html5 compliant code
|
2019-03-20 09:32:57 +01:00 |
|
Philippe GRAND
|
6aa4e82e20
|
update with html5 compliant code
|
2019-03-20 09:31:28 +01:00 |
|
Philippe GRAND
|
e519bfc64b
|
update with html5 compliant code
|
2019-03-20 09:27:28 +01:00 |
|
Philippe GRAND
|
8563d1e867
|
update with html5 compliant code
|
2019-03-19 14:19:40 +01:00 |
|
Philippe GRAND
|
1a21799585
|
update with html5 compliant code
|
2019-03-19 14:19:01 +01:00 |
|
Philippe GRAND
|
c9cd4260d6
|
update with html5 compliant code
|
2019-03-19 14:17:59 +01:00 |
|
Philippe GRAND
|
11c66a88bc
|
update with html5 compliant code
|
2019-03-19 14:17:20 +01:00 |
|
Philippe GRAND
|
200e7172ad
|
update with html5 compliant code
|
2019-03-19 14:16:42 +01:00 |
|
Laurent Destailleur
|
cb9f30ceeb
|
Look and feel v10
|
2019-03-19 10:36:37 +01:00 |
|
Laurent Destailleur
|
6a41819d0f
|
Enhance the perf page.
|
2019-03-17 00:55:18 +01:00 |
|
Laurent Destailleur
|
a6add0d8a9
|
Debug module debugbar
|
2019-03-17 00:48:12 +01:00 |
|
Laurent Destailleur
|
1abfd1f58e
|
Add page to setup module debugbar
Fix CSS
|
2019-03-17 00:32:39 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
bcf0dd0168
|
Merge branch 'develop' into patch-5
|
2019-03-14 16:47:08 +01:00 |
|
Frédéric FRANCE
|
f25ce3b40c
|
Update facture.php
|
2019-03-14 16:43:52 +01:00 |
|
Laurent Destailleur
|
cdf6e4b65a
|
Fix some PSR rules
|
2019-03-14 16:43:27 +01:00 |
|
Frédéric FRANCE
|
1222d90537
|
phpcs fix
|
2019-03-14 16:40:44 +01:00 |
|
Laurent Destailleur
|
39e6e71b0d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2019-03-14 14:20:34 +01:00 |
|
Laurent Destailleur
|
f8a4d9075b
|
Fix css for fontawesome 5
|
2019-03-14 11:48:25 +01:00 |
|
Laurent Destailleur
|
ae6b672204
|
Look and feel v10
|
2019-03-13 15:04:38 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Regis Houssin
|
47057b431d
|
FIX translation
|
2019-03-12 07:56:22 +01:00 |
|
Regis Houssin
|
259fa0ac81
|
FIX check only if invoice module is enabled (bank is check after)
|
2019-03-12 07:42:25 +01:00 |
|
Regis Houssin
|
94c58072d7
|
FIX possibility to set up payment mode when invoice module is disabled
|
2019-03-12 07:29:29 +01:00 |
|
Laurent Destailleur
|
b710e28ffa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
|
2019-03-09 01:20:13 +01:00 |
|
Laurent Destailleur
|
1a96a7a88f
|
FIX More complete auto setup of barcode module
Add tooltip help on member setup module
|
2019-03-08 11:31:12 +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 |
|
Laurent Destailleur
|
e67890bd22
|
NEW Can enter price with or without tax when entering expense repor line
|
2019-03-07 11:09:04 +01:00 |
|
Laurent Destailleur
|
31c296f44b
|
Fix bad tooltip to rm file
|
2019-03-06 20:01:21 +01:00 |
|
Laurent Destailleur
|
e66447eabc
|
Fix phpcs
|
2019-03-05 15:53:57 +01:00 |
|
Laurent Destailleur
|
b7066d92cc
|
More info
|
2019-03-04 20:37:03 +01:00 |
|
Laurent Destailleur
|
e974a3b2b3
|
Add more info
|
2019-03-04 20:36:05 +01:00 |
|
Laurent Destailleur
|
1cfbf5f551
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/security.php
|
2019-03-04 20:18:23 +01:00 |
|
Laurent Destailleur
|
15138aa543
|
FIX error on setup of password if pass generators have a .old file.
|
2019-03-04 20:00:36 +01:00 |
|
Laurent Destailleur
|
ff9b6c2f04
|
Module ticket
|
2019-03-04 19:19:20 +01:00 |
|
Laurent Destailleur
|
4a582485b9
|
Debug module ticket
|
2019-03-04 19:19:09 +01:00 |
|
Laurent Destailleur
|
bb9a64fd07
|
Fix phpcs
|
2019-03-04 17:25:13 +01:00 |
|
Laurent Destailleur
|
d8259f94e1
|
Work on BOM module
|
2019-03-04 13:40:16 +01:00 |
|
Laurent Destailleur
|
925def5390
|
Work on BOM module
|
2019-03-04 13:37:00 +01:00 |
|
Laurent Destailleur
|
7b7ff33fdf
|
Work on BOM module
|
2019-03-04 13:30:43 +01:00 |
|
Laurent Destailleur
|
34c179ab2b
|
Fix responsive
|
2019-03-04 10:42:09 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
9b165f6b3f
|
add visibility
|
2019-02-27 20:45:07 +01:00 |
|
Laurent Destailleur
|
6373e1db84
|
Merge branch 'develop' into 10.0_linkedin
|
2019-02-27 01:16:21 +01:00 |
|
Laurent Destailleur
|
3a2a1b4a56
|
Debug module ticket
|
2019-02-26 13:43:09 +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 |
|
Frédéric FRANCE
|
48de805bce
|
replace html code by html5 in admin
|
2019-02-23 21:57:35 +01:00 |
|
Laurent Destailleur
|
cdf85b0d00
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-23 16:02:35 +01:00 |
|
Laurent Destailleur
|
0081d3c25d
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-23 16:02:10 +01:00 |
|
Laurent Destailleur
|
af6c482f26
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-23 16:01:30 +01:00 |
|
ptibogxiv
|
454ab2e866
|
FIX Stripe live Oauth
|
2019-02-22 14:54:26 +01:00 |
|
Laurent Destailleur
|
4a3751a054
|
Fix html5
|
2019-02-21 19:50:54 +01:00 |
|
gauthier
|
58d82eb477
|
FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it
|
2019-02-21 11:08:55 +01:00 |
|
Laurent Destailleur
|
e6e18ff616
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
|
2019-02-14 15:33:17 +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 |
|
Laurent Destailleur
|
fbfb4ce566
|
FIX creation of new left menu entry
|
2019-02-14 10:10:31 +01:00 |
|
florian HENRY
|
dd9896516b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
|
2019-02-13 12:52:07 +01:00 |
|
Laurent Destailleur
|
5c27ec5d25
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
|
2019-02-13 11:21:20 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
Laurent Destailleur
|
11f48460b2
|
Fix
|
2019-02-12 23:26:25 +01:00 |
|
Laurent Destailleur
|
d86017b8ff
|
Fix create left menu entry
|
2019-02-12 23:21:53 +01:00 |
|
Laurent Destailleur
|
639dfa09aa
|
Fix creation of left menu
|
2019-02-12 23:17:40 +01:00 |
|
Laurent Destailleur
|
1f9f335e44
|
FIX creation of menu entry with parent id not int
Conflicts:
htdocs/admin/menus/edit.php
|
2019-02-12 19:11:05 +01:00 |
|
Laurent Destailleur
|
986fb2ae38
|
FIX creation of menu entry with parent id not int
|
2019-02-12 19:09:27 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Laurent Destailleur
|
843f7bea8d
|
Merge pull request #10546 from frederic34/patch-20
Update index.php
|
2019-02-12 13:46:33 +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 |
|
Frédéric FRANCE
|
be9cfdae85
|
Update index.php
|
2019-02-11 00:05:38 +01:00 |
|
Frédéric FRANCE
|
4d6dcf400e
|
first parameter of print_liste_field_titre was translated
|
2019-02-10 17:30:34 +01:00 |
|
Frédéric FRANCE
|
ba32c3b782
|
first parameter of print_liste_field_titre was translated
|
2019-02-10 16:06:07 +01:00 |
|
Frédéric FRANCE
|
aecac3632f
|
wip
|
2019-02-10 11:08:48 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
7f4bbcf9a5
|
Some minor fix in default values and modulebuilder
|
2019-02-09 13:40:22 +01:00 |
|
Laurent Destailleur
|
aa574c2a47
|
Merge pull request #10517 from frederic34/patch-18
fix phpcs
|
2019-02-08 09:56:50 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Frédéric FRANCE
|
c0686733e8
|
fix phpcs
|
2019-02-06 15:56:13 +01:00 |
|
Laurent Destailleur
|
9e28db4202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
|
2019-02-06 00:51:10 +01:00 |
|
Laurent Destailleur
|
44f5223c90
|
Remove warning
|
2019-02-05 18:54:38 +01:00 |
|
Laurent Destailleur
|
d49dd8d593
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:16:44 +01:00 |
|
Laurent Destailleur
|
bb8b3d4e5c
|
Add br
|
2019-02-05 00:25:42 +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
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +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
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Frédéric FRANCE
|
b2e2b2e186
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-31 18:27:27 +01:00 |
|
Philippe GRAND
|
0cc8053708
|
update with html5 compliant code
|
2019-01-31 12:42:38 +01:00 |
|
Philippe GRAND
|
1cda3106b2
|
update with html5 compliant code
|
2019-01-31 12:40:50 +01:00 |
|
Philippe GRAND
|
2a9c378c1f
|
update with html5 compliant code
|
2019-01-31 12:35:49 +01:00 |
|
Philippe GRAND
|
ff46a0ee30
|
update with html5 compliant code
|
2019-01-31 12:33:01 +01:00 |
|
Laurent Destailleur
|
4c31749f4b
|
Add tooltip on setup
|
2019-01-31 11:11:56 +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
|
6d3529b606
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-30 14:47:28 +01:00 |
|
Laurent Destailleur
|
340412ed00
|
FIX generation of document for supplie rinvoice
|
2019-01-30 14:07:50 +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
|
ecc30b8ffe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2019-01-27 18:27:58 +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 |
|
Laurent Destailleur
|
3c88816bf8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-27 17:44:13 +01:00 |
|
Laurent Destailleur
|
d59097f65c
|
Fix upload of module file
|
2019-01-27 17:40:56 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|