Commit Graph

18254 Commits

Author SHA1 Message Date
Laurent Destailleur
de396dc9b3 Clean code for order of modules 2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2 2019-10-17 18:16:57 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right
Fix Stock movement user's right (Fixes #11967)
2019-10-17 17:53:17 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019
Internationalization
2019-10-17 17:42:44 +02:00
Laurent Destailleur
c64a537bfd
Merge pull request #12155 from frederic34/patch-14
Update html.formticket.class.php
2019-10-17 17:42:30 +02:00
Laurent Destailleur
9397407f23
Merge pull request #12149 from grandoc/new_branch_16_10_2019
internationalization
2019-10-17 17:41:51 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7
use current local time on Now button
2019-10-17 17:41:16 +02:00
Gildas
132ea56a59 Fix Stock movement user's right (Fixes #11967) 2019-10-17 17:06:38 +02:00
Philippe GRAND
2efeeb0ad8 Internationalization 2019-10-17 14:47:03 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php 2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php 2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php 2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php 2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
41dd53170e Code comment 2019-10-16 19:07:17 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
2019-10-16 17:27:41 +02:00
Laurent Destailleur
8152c60878 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2019-10-16 17:13:14 +02:00
Laurent Destailleur
b47ebcca2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:10 +02:00
Philippe GRAND
10fd472392 internationalization 2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be internationalization 2019-10-16 15:46:46 +02:00
stickler-ci
fce1f1991c Fixing style errors. 2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button
use current local time for feed the date according to locale settings
2019-10-16 14:32:17 +02:00
Laurent Destailleur
7a927a22e3
Merge pull request #12137 from frederic34/patch-15
Update box_task.php
2019-10-16 14:31:01 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1
New: Set a pricing rule by default for new clean installation
2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019
Internationalization
2019-10-16 13:24:10 +02:00
Laurent Destailleur
ea2986037f
Merge pull request #12147 from homer8173/patch-5
Fix user time instead of server time
2019-10-16 13:12:37 +02:00
Laurent Destailleur
1d7efbdc64
Merge pull request #12138 from frederic34/patch-16
FIX datec in box ticket
2019-10-16 13:02:59 +02:00
stickler-ci
bba042c0c3 Fixing style errors. 2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time
it seems that we want to use a user time by clicking on now button.

IDEA : may i use client time ??? because if page is old, the now button insert an old time.
2019-10-16 12:28:50 +02:00
Laurent Destailleur
6d05d42c50 Look and feel v11 2019-10-16 11:26:20 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e phpcs 2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa Mutualize code 2019-10-16 01:36:07 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Laurent Destailleur
9ce71c26aa Use alpha logo by default 2019-10-15 11:41:22 +02:00
Laurent Destailleur
63a60c7811 NEW Add option MAIN_PDF_FORCE_FONT_SIZE 2019-10-15 11:13:14 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c Removed warning 2019-10-15 00:44:22 +02:00
Frédéric FRANCE
194072fc60
Update box_last_ticket.php 2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8
Update box_last_modified_ticket.php 2019-10-15 00:13:52 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
2019-10-14 23:55:10 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php 2019-10-14 23:27:37 +02:00
stickler-ci
30099a821b Fixing style errors. 2019-10-14 19:39:00 +00:00