Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Laurent Destailleur
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Laurent Destailleur
dd72a52e8f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balancebymonth.php
htdocs/accountancy/class/accountancyexport.class.php
2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f
FIX #16431
2021-02-26 19:18:03 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory
2021-02-26 16:19:52 +01:00
Laurent Destailleur
5d0a0fe341
Clean code
2021-02-26 14:53:16 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory
2021-02-23 22:03:23 +01:00
Florian HENRY
fa65956801
Merge branch 'develop' into dev_EventOrganisation_draft
2021-02-22 21:02:22 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21
2021-02-22 11:18:07 +01:00
Alexandre SPANGARO
267b095786
Fix import/export
2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
dfb6490bb4
Fix export
2021-02-22 05:24:39 +01:00
Alexandre SPANGARO
116a491ae1
Revert "Fix export"
...
This reverts commit 01e351e87e
2021-02-22 05:23:02 +01:00
Alexandre SPANGARO
01e351e87e
Fix export
2021-02-22 05:19:48 +01:00
Florian HENRY
556ba2b369
statart card
2021-02-20 23:17:48 +01:00
Alexandre SPANGARO
3dcfe40e71
Code enhanced - Standardize field name #14697
2021-02-20 08:00:27 +01:00
Laurent Destailleur
3a073c75e7
Too verbose
2021-02-19 18:01:47 +01:00
Florian HENRY
e46d4ee75d
fix sample product import files
2021-02-19 18:01:36 +01:00
Florian HENRY
f111302a25
fix column count
2021-02-19 18:01:25 +01:00
Florian HENRY
32a360dd2a
fix sample xls file
2021-02-19 18:01:16 +01:00
Florian HENRY
527c32d79e
with new phpoffice col start at 1 not 0
2021-02-19 18:01:04 +01:00
Laurent Destailleur
db34481cf6
Merge pull request #16345 from FHenry/13_fix_column_excelfiles
...
FIX : Import Excel Failed and sample import file excel missing 1st column
2021-02-19 17:56:58 +01:00
Laurent Destailleur
fd0615b3fc
Too verbose
2021-02-19 17:56:04 +01:00
Laurent Destailleur
3ab80469ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427
Merge pull request #16338 from aspangaro/13p5
...
Fix module asset in development
2021-02-19 16:05:35 +01:00
Florian HENRY
6fe9b589ed
fix sample product import files
2021-02-18 12:50:15 +01:00
Florian HENRY
58a1904c15
fix column count
2021-02-18 12:48:06 +01:00
Florian HENRY
de2d5c7188
fix sample xls file
2021-02-18 12:24:24 +01:00
Florian HENRY
35dc1e7d4f
with new phpoffice col start at 1 not 0
2021-02-18 11:04:37 +01:00
stickler-ci
8673f7625f
Fixing style errors.
2021-02-17 17:36:29 +00:00
Florian HENRY
fc3cc915ee
new_add_field_product_export
2021-02-17 18:29:56 +01:00
Laurent Destailleur
32370bf63d
Look and feel v14
2021-02-15 20:13:38 +01:00
Laurent Destailleur
0bac454f25
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 16:40:45 +01:00
Laurent Destailleur
7b383b58c6
Trans
2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
...
wip : Event Organization module - PR-1 - setup page #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Florian HENRY
02b698c128
move files to real diredtory
2021-02-14 17:09:23 +01:00
Laurent Destailleur
cd4d790d2b
Add parameters of batch into comment description
2021-02-12 17:15:23 +01:00
Laurent Destailleur
4a2cd0d509
Merge pull request #16253 from AlexisLaurier/13.0
...
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Laurent Destailleur
1b11d9d0e9
FIX payment term label on PDF
2021-02-11 17:48:53 +01:00
Alexis LAURIER
468f40743d
contract - use multidir_output
2021-02-10 13:18:55 +01:00
Philippe GRAND
66b06405d9
standardization, internationalisation
2021-02-09 14:20:10 +01:00
Philippe GRAND
44f2269764
standardization, internationalisation
2021-02-09 14:19:17 +01:00
Philippe GRAND
8fd7d3e586
standardization, internationalisation
2021-02-09 14:18:27 +01:00
Philippe GRAND
182563329f
standardization, internationalisation
2021-02-09 14:17:38 +01:00
Philippe GRAND
635260e59f
standardization, internationalisation
2021-02-09 14:16:47 +01:00
Philippe GRAND
663108d239
standardization, internationalisation
2021-02-09 14:16:17 +01:00
Philippe GRAND
8d9ae906c8
standardization, internationalisation
2021-02-09 14:15:45 +01:00
Philippe GRAND
e1bf624e45
standardization, internationalisation
2021-02-09 14:15:14 +01:00
Philippe GRAND
a2b5a3190d
standardization, internationalisation
2021-02-09 14:14:40 +01:00
Philippe GRAND
c1bbd076df
standardization, internationalisation
2021-02-09 14:13:49 +01:00
Philippe GRAND
1317b5cfac
standardization, internationalisation
2021-02-09 14:13:12 +01:00
Philippe GRAND
3e9a6818f2
standardization, internationalisation
2021-02-09 14:12:27 +01:00
Philippe GRAND
f47d5e6a69
standardization, internationalisation
2021-02-09 14:10:07 +01:00
Philippe GRAND
ef3e7fa65a
standardization, internationalisation
2021-02-09 14:09:35 +01:00
Philippe GRAND
2fc6d76029
standardization, internationalisation
2021-02-09 14:09:02 +01:00
Philippe GRAND
ee50cee862
standardization, internationalisation
2021-02-09 14:07:58 +01:00
Philippe GRAND
a50ecdd1aa
standardization, internationalisation
2021-02-09 14:06:55 +01:00
Philippe GRAND
fff2c1fbac
standardization, internationalisation
2021-02-09 14:06:22 +01:00
Philippe GRAND
4840fa8214
standardization, internationalisation
2021-02-09 14:05:19 +01:00
Philippe GRAND
858ebf5aaf
standardization, internationalisation
2021-02-09 14:04:38 +01:00
Philippe GRAND
a8b72c98a2
standardization, internationalisation
2021-02-09 14:03:13 +01:00
Philippe GRAND
ff0c105207
standardization, internationalisation
2021-02-09 14:01:50 +01:00
Philippe GRAND
55dd15cbf6
standardization, internationalisation
2021-02-09 14:01:10 +01:00
Philippe GRAND
11053fe0ed
standardization, internationalisation
2021-02-09 14:00:26 +01:00
Philippe GRAND
39c3bcd265
standardization, internationalisation
2021-02-09 13:58:26 +01:00
Laurent Destailleur
3b0268424b
Merge pull request #16227 from grandoc/new_branch_08_02_2021
...
Save the name of generated file as the main doc when generating a doc…
2021-02-09 13:24:02 +01:00
Laurent Destailleur
401b4f641d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Philippe GRAND
f27dd77cb6
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:47:31 +01:00
Philippe GRAND
62d6666927
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:46:09 +01:00
Philippe GRAND
d9eb727c0f
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:44:46 +01:00
Philippe GRAND
f80da203e0
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:43:36 +01:00
Philippe GRAND
6b0bb90ab2
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:40:27 +01:00
Laurent Destailleur
c33fb4badc
Merge pull request #16219 from FHenry/dev_fix_continue
...
Add extrafileld value into return ajax
2021-02-08 16:57:03 +01:00
Florian HENRY
cb152b22df
fix ajax
2021-02-08 15:47:37 +01:00
Laurent Destailleur
5c64173bfa
Merge pull request #16209 from frederic34/barcodepicto
...
add barcode picto in left menu
2021-02-08 15:04:56 +01:00
Laurent Destailleur
026e454825
Merge pull request #16208 from frederic34/ecmpicto
...
add ecm picto in left menu
2021-02-08 15:04:42 +01:00
Alexandre SPANGARO
b8ea96ba57
Fix module asset in development
2021-02-08 05:39:07 +01:00
Frédéric FRANCE
e1a22b7209
add blockedlog picto in left menu
2021-02-07 22:18:34 +01:00
Frédéric FRANCE
3c8ddf917f
add barcode picto in left menu
2021-02-07 22:15:20 +01:00
Frédéric FRANCE
b43dfe1139
add ecm picto in left menu
2021-02-07 22:04:46 +01:00
Laurent Destailleur
fc30b91960
Fix warning
2021-02-07 21:56:57 +01:00
Laurent Destailleur
92e67b2c54
Merge pull request #16195 from frederic34/morepictomodule
...
add more picto for module
2021-02-07 20:01:36 +01:00
Laurent Destailleur
ec394a93f6
Merge pull request #16191 from grandoc/develop
...
fix typo
2021-02-07 19:59:54 +01:00
Frédéric FRANCE
b96e405717
add picto member
2021-02-06 17:18:00 +01:00
Frédéric FRANCE
3bcf795d55
add more picto for module
2021-02-06 14:44:08 +01:00
Frédéric FRANCE
eaaefe1382
5.5 to 5.6
2021-02-06 14:12:22 +01:00
Frédéric FRANCE
7860ffa28e
update phpmin version
2021-02-06 13:48:31 +01:00
Philippe GRAND
ce7a3ae2f0
fix typo
2021-02-06 13:11:58 +01:00
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
Florian HENRY
fcb5b3900d
FIX : #16189 , fix download/see check deposit PDF
2021-02-06 12:39:40 +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
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +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
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 21:06:12 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 13:58:27 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2
2021-01-13 17:40:21 +01:00
Laurent Destailleur
93a2edd8d9
Fix property not used
2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7
Fix version
2021-01-13 12:20:32 +01:00
stickler-ci
432d45b289
Fixing style errors.
2021-01-13 11:19:39 +00:00
Laurent Destailleur
1499998a99
Debug
2021-01-13 12:17:45 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +01:00
zuiko
f718a396d5
Update mod_barcode_product_standard.php
...
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
2021-01-12 21:59:09 +01:00
zuiko
364158c35b
Update mod_barcode_product_standard.php
...
Blank line after comment removed...
2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c
Fixing style errors.
2021-01-12 20:16:34 +00:00
