Philippe GRAND
04373fb531
fix typo
2021-02-06 13:11:08 +01:00
Philippe GRAND
bf211c6423
fix typo
2021-02-06 13:10:00 +01:00
Laurent Destailleur
3dedd81f37
Same width for all picto of menu
2021-02-06 11:56:27 +01:00
Laurent Destailleur
c1eba5a885
Merge pull request #16188 from frederic34/menuprefix
...
modules can add prefix for menu
2021-02-06 11:41:46 +01:00
Frédéric FRANCE
b487644cb7
sample use for margin module
2021-02-06 10:52:03 +01:00
Frédéric FRANCE
df67de08b1
modules can add prefix for menu
2021-02-06 10:16:07 +01:00
Laurent Destailleur
a2a2127953
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-06 01:17:16 +01:00
Laurent Destailleur
fd3354142b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Philippe GRAND
47ca631193
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:09:36 +01:00
Philippe GRAND
5b5ea075e7
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:07:02 +01:00
Philippe GRAND
5856f9e5cb
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:04:46 +01:00
Philippe GRAND
4170332aee
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:58:54 +01:00
Philippe GRAND
0f196d7f19
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:56:57 +01:00
Philippe GRAND
e638c238c6
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:54:51 +01:00
Philippe GRAND
7c13428456
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:53:34 +01:00
Philippe GRAND
c03da95acb
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:52:12 +01:00
Philippe GRAND
d85c8c44fc
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:49:43 +01:00
Philippe GRAND
998c5b2ec3
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:42:33 +01:00
Philippe GRAND
c96d36cad3
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:39:22 +01:00
Laurent Destailleur
482ad20a4d
Log debug before archive logs
2021-02-05 16:14:42 +01:00
Laurent Destailleur
ac83cea83a
Fix avoid to run import twice by clicking on tab step6
...
Fix timeout for real import step
2021-02-05 14:34:04 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
Laurent Destailleur
217989d0e2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-02 15:37:40 +01:00
Laurent Destailleur
6b32fd33fd
Fix export with excell
2021-02-02 13:33:44 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
f5df3b1d69
Clean code to try to fix #16123
2021-02-02 01:30:23 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +01:00
Laurent Destailleur
6fe5c2f599
Merge pull request #16109 from grandoc/new_branch_30_01_2021
...
missing declaration
2021-01-30 13:08:56 +01:00
Philippe GRAND
e584792382
missing declaration
2021-01-30 12:57:06 +01:00
Laurent Destailleur
1063b97c22
Close #16099 Close #16098
2021-01-30 12:55:38 +01:00
Philippe GRAND
0f19a11ebe
missing declaration
2021-01-30 12:54:10 +01:00
Laurent Destailleur
06b0b0ac66
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE
...
Bug Photo in propal
2021-01-30 12:51:33 +01:00
Anthony Berton
e48fc6c3d0
Update pdf_cyan.modules.php
2021-01-29 13:51:06 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php
2021-01-29 10:50:11 +01:00
Anthony Berton
720a11877d
Update pdf_azur.modules.php
2021-01-29 10:48:58 +01:00
stickler-ci
400243a157
Fixing style errors.
2021-01-29 09:41:05 +00:00
Anthony Berton
fcf72d5e50
Update pdf_azur.modules.php
2021-01-29 10:35:48 +01:00
Laurent Destailleur
a4c0459c1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Alexandre SPANGARO
94d4f2da8e
Missing language key & error translation
2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15
Draft code
2021-01-25 18:59:04 +01:00
Laurent Destailleur
599d69b07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
7982cab526
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/contract/doc/pdf_strato.modules.php
htdocs/ticket/card.php
2021-01-21 18:34:55 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1
...
Fix #15633 : Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
2021-01-21 13:33:47 +01:00
BlackMirror
640cf50b7f
[FM] Fix 12.0 - duplicate label, probably mistaken for ref
2021-01-20 15:20:50 +01:00
Laurent Destailleur
0917b37bb9
FIX #15966 #15967
2021-01-19 15:20:35 +01:00
stickler-ci
0cdd9f8640
Fixing style errors.
2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a
Update mod_barcode_product_standard.php
...
Fix #15633 : Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918
ok with @eldy
Avoid sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
2021-01-19 11:40:53 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2
2021-01-13 17:40:21 +01:00
