Laurent Destailleur
04ac12b477
Merge pull request #17508 from dolibit-ut/patch-319
...
Update llx_00_c_country.sql
2021-05-06 15:57:17 +02:00
Anthony Berton
2615a1f152
Update list.php
2021-05-06 15:34:45 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields
2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0
reconcile before PR - second take
2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859
reconcile before PR
2021-05-06 15:19:29 +02:00
Dorian Vabre
2f7dd4e807
wip vote page
2021-05-06 14:53:23 +02:00
altairis-noe
2bdea3732d
days in lifetime trans
2021-05-06 14:52:48 +02:00
Dorian Vabre
a00c9c44c3
now adding contact to conforbooth, not only to thirdparty
2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17
country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change
2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c
country now only required when paying a booth, dates of start and end required
2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf
fixes: show only correspond button on specific page, id no longer encoded in hidden parameter
2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89
update on specifications on suggesting a booth/conf since its now two separated pages
2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88
now 2 distinct pages to suggest a conf or a booth
2021-05-06 11:49:00 +02:00
Dorian Vabre
099ad77d44
encryption change for url
2021-05-06 11:32:07 +02:00
Dorian Vabre
10c9e9b77c
wip
2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67
wip
2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd
creation of the 3 main pages
2021-05-06 11:26:42 +02:00
Laurent Destailleur
6f4e151b91
Fix permissions
2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00
Fix sql
2021-05-06 11:18:35 +02:00
altairis-noe
7c53e2bb18
too much td
2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da
one more space
2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c
spaces after !
2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8
qcstatus out of formproduct and corrections in syntax
2021-05-06 09:59:33 +02:00
lmarcouiller
d55309c847
fix rename file
2021-05-06 09:46:54 +02:00
UT from dolibit
6b89b99dfd
Update llx_00_c_country.sql
2021-05-05 23:07:52 +02:00
Laurent Destailleur
19f78b2e8f
More compact gui
2021-05-05 19:13:40 +02:00
ATM john
63292255cc
Fix search accented words in product description
2021-05-05 18:45:23 +02:00
altairis-noe
5be2bdd123
qcstatus is not for this branch
2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde
no qcstatus in productlot class
2021-05-05 17:47:01 +02:00
Gauthier PC portable 024
9108651a7a
FIX : if dom is added with ajax, selector need to keep working
2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506
fix: allow webdavs link type
2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7
fix missing token
2021-05-05 17:05:51 +02:00
altairis-noe
94e485aa06
qc_frequency in days and qcstatus elsewhere
2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe
Add endofline in errors.lang
2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f
Fix #17501 : Undownloable attached file
2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8
New: Add import on BOM
2021-05-05 13:47:43 +02:00
Anthony Berton
ed26e75c0b
init
2021-05-05 11:54:16 +02:00
Marc de Lima Lucio
139ae3db00
FIX: pgsql: prevent 'WHERE 1'
2021-05-05 11:49:11 +02:00
lmarcouiller
209682e710
Fix #17361 : changes into mysql/tables of export_model
2021-05-05 11:30:13 +02:00
stickler-ci
95be7e8a63
Fixing style errors.
2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22
Fix #17491 : date extrafield filter works well now
2021-05-05 11:26:15 +02:00
lmarcouiller
c1ac2ebc86
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#1
2021-05-05 10:45:24 +02:00
Laurent Destailleur
17a8c73fad
CSS
2021-05-05 03:08:34 +02:00
Laurent Destailleur
7860464724
Sync transifex
2021-05-05 01:48:21 +02:00
Laurent Destailleur
e1498ca7ef
Clean code
2021-05-05 01:26:06 +02:00
Laurent Destailleur
f37033b1f4
CSS
2021-05-05 00:56:40 +02:00
Laurent Destailleur
f1929eb106
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc
Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE
2021-05-05 00:15:52 +02:00
daraelmin
d840593ed7
Fix amnt can be paid for member as membersubscription
2021-05-04 23:19:19 +02:00
stickler-ci
fb3c8e698e
Fixing style errors.
2021-05-04 20:59:32 +00:00
daraelmin
866857c111
Html link instead of url in substitutionarray
2021-05-04 21:57:59 +02:00
daraelmin
b04dfcadc7
Add function to get html online payment link
2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6
Add date in error message
2021-05-04 19:43:33 +02:00
ATM john
6574e54a41
Fix saving template email
2021-05-04 18:09:13 +02:00
Laurent Destailleur
f2e61ff807
Fix substitution into topic
2021-05-04 18:04:09 +02:00
Florian HENRY
c4e0d8da42
FIX: merge thirparty also work for bank URL entry
2021-05-04 17:28:20 +02:00
Marc de Lima Lucio
ef6ebd4793
FIX: expense report: column last_main_doc forgotten in v14 migration script
2021-05-04 16:24:15 +02:00
Laurent Destailleur
f6305bf551
FIX Sql error
2021-05-04 15:46:38 +02:00
lmarcouiller
457a96bc34
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
NextGestion
e497e58ebd
Conflicts
2021-05-04 10:29:31 +01:00
Laurent Destailleur
ce869003cf
Prepare beta v14
2021-05-04 11:13:22 +02:00
Laurent Destailleur
c82317c8af
Fix missing include
2021-05-04 11:06:24 +02:00
Laurent Destailleur
b14de0bff7
NEW Can clone a cron job.
2021-05-04 10:56:21 +02:00
stickler-ci
60fc9f5ecd
Fixing style errors.
2021-05-04 07:52:53 +00:00
kastoras
ee4288fae3
NEW Add pagination at Get Products response
...
At REST API generate pagination data when getting products list using $pagination_data parameter
2021-05-04 10:48:31 +03:00
daraelmin
729a5677ad
Group tooltip by key type
2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys
2021-05-04 01:41:32 +02:00
Laurent Destailleur
36c6a41b1b
Fix non traversable case
2021-05-04 01:14:44 +02:00
Laurent Destailleur
08dbe74643
Fix code not reachable
2021-05-04 01:10:53 +02:00
daraelmin
034378a958
Add online substitution keys link in mailing
2021-05-04 00:58:29 +02:00
Laurent Destailleur
1f31b5851b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-04 00:35:49 +02:00
Laurent Destailleur
1d0c0a8d2a
Fix phpcs
2021-05-04 00:35:36 +02:00
Laurent Destailleur
da08670a3d
Update 13.0.0-14.0.0.sql
2021-05-04 00:24:32 +02:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop
2021-05-04 00:23:28 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete
...
FIX missing token on dolGetButtonAction for action delete
2021-05-04 00:21:55 +02:00
Laurent Destailleur
b500f27796
Merge pull request #17482 from daraelmin/daraelmin-patch-2
...
Fix undefined translation key
2021-05-04 00:20:23 +02:00
Laurent Destailleur
816acaa4c2
css
2021-05-04 00:17:47 +02:00
Laurent Destailleur
b2901bfae0
Make code simpler
2021-05-04 00:15:06 +02:00
Laurent Destailleur
af9b2414a0
Merge pull request #17480 from bb2a/ajax-pdf-option
...
Use AJAX PDF Options
2021-05-04 00:06:18 +02:00
Laurent Destailleur
16f1651d4e
Add missing action events in trigger
2021-05-04 00:04:44 +02:00
Laurent Destailleur
04930c2a98
Fix filter
2021-05-03 23:21:39 +02:00
Laurent Destailleur
b3af666697
Clean code
2021-05-03 23:09:11 +02:00
Laurent Destailleur
826e3d2855
Merge pull request #17314 from atm-jpb/develop_mcurrencyRate
...
NEW mcurrency rate
2021-05-03 23:01:33 +02:00
Laurent Destailleur
9e5fdfdec3
Update multicurrency_rate.php
2021-05-03 23:01:05 +02:00
Anthony Berton
9ef49a15e4
Update pdf.php
2021-05-03 22:28:40 +02:00
daraelmin
6644fd3a73
Fix undefined translation key
2021-05-03 22:15:40 +02:00
Laurent Destailleur
6e32efdb40
Fix phpcs
2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9
Disable empty tabs
2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate
...
New Add option for doctemplate
2021-05-03 19:45:40 +02:00
Laurent Destailleur
08806a6d9a
Merge pull request #17403 from kastoras/product_variants_api_add_stock_to_response
...
New/NEW Product Variants API, add variant stock to response
2021-05-03 19:39:50 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3
Enhance error management
2021-05-03 19:25:16 +02:00
Laurent Destailleur
a36df785b0
Fix lang
2021-05-03 19:20:49 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport
...
Fix show table of pdf payments repports in file order
2021-05-03 19:19:00 +02:00
Laurent Destailleur
bb5e1c59c7
Merge pull request #17478 from FHenry/13_fix_eventfromcontact
...
FIX: create event from contact card preselect contact correctly
2021-05-03 19:17:52 +02:00
Laurent Destailleur
cbc481dc60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/list.php
htdocs/adherents/type.php
htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/boxes/box_produits_alerte_stock.php
2021-05-03 18:57:52 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php
2021-05-03 18:55:25 +02:00
Laurent Destailleur
03e8f2aee1
Fix for performance troubles
2021-05-03 18:49:37 +02:00
WimpyMan
706545081c
FIX #17476 releve.php: Fix SQL statement
...
Single quotes `'` should be uses instead of double quotes `"` for
string values.
2021-05-03 18:29:53 +02:00
Laurent Destailleur
28b1d83ae9
Make some performance enhancements
2021-05-03 18:29:21 +02:00
Florian HENRY
9278228e20
FIX: create event from contact card preselect contact correctly
2021-05-03 18:08:49 +02:00
Indelog
c18848c944
Fix: simplify code with dol_dir_list()
2021-05-03 17:17:44 +02:00
Laurent Destailleur
c5449fdd66
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-03 16:48:53 +02:00
Laurent Destailleur
49a0304071
Add TODO
2021-05-03 16:48:40 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php
2021-05-03 16:16:44 +02:00
Laurent Destailleur
9ce510f5f9
Merge pull request #17443 from Hystepik/develop#1
...
Fix : Error on knowledgemanagement_list error $sql extrafields
2021-05-03 16:16:04 +02:00
Indelog
dba9b17275
Fix forgot payment filter on file name
2021-05-03 16:00:14 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria
...
NEW rise code tries in digeteria customer and supplier accountant code
2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5
Fix phpunit for crop of image
2021-05-03 15:56:56 +02:00
Laurent Destailleur
5aa9927784
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-03 15:37:40 +02:00
Laurent Destailleur
5d870d5802
FIx #17447
2021-05-03 15:36:34 +02:00
Laurent Destailleur
ec544cb20e
Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype
...
NEW #17292 default subscription amount by adherent type
2021-05-03 15:32:39 +02:00
UT from dolibit
9bf10c50a2
Update llx_20_c_departements.sql
...
Peru
2021-05-03 15:29:49 +02:00
Laurent Destailleur
1847180c52
Merge pull request #17449 from mafzalzadeh/develop
...
fixed Persian themes direction to rtl
2021-05-03 15:20:16 +02:00
Laurent Destailleur
0dc2c0050c
Merge pull request #17452 from daraelmin/daraelmin-patch-3
...
Fix #17352 card nb overlaps exp date on payment with stripe
2021-05-03 15:00:53 +02:00
Laurent Destailleur
914d27990d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-03 14:58:41 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
e5b49ce0a2
Merge pull request #17448 from LuferGonn/fourn_facture_change_001
...
Update fourn/facture/card.php: Change position(ExtraFields)
2021-05-03 14:12:07 +02:00
Laurent Destailleur
c6a9117a00
Graph color
2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
...
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
6ef463f688
Code comment
2021-05-03 13:54:26 +02:00
Laurent Destailleur
42c2fb5736
Fix sql error on new filter
2021-05-03 13:47:26 +02:00
Laurent Destailleur
1c61d2df9f
Merge pull request #17455 from aspangaro/14a42
...
NEW Accountancy - Possibility to select journals in balance
2021-05-03 13:36:08 +02:00
Laurent Destailleur
a806a18455
Reduce sql
2021-05-03 13:35:10 +02:00
Laurent Destailleur
097ccdab9f
Merge pull request #17454 from aspangaro/14a30
...
NEW Accountancy - Add select date from/to in binding page
2021-05-03 13:19:12 +02:00
Laurent Destailleur
cc0739d531
Merge pull request #17456 from dolibit-ut/patch-309
...
Update llx_20_c_departements.sql
2021-05-03 13:17:24 +02:00
Laurent Destailleur
a9da0ec93f
Merge pull request #17432 from dolibit-ut/patch-307
...
Update llx_00_c_country.sql
2021-05-03 13:17:03 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Laurent Destailleur
9a69813f85
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-03 13:12:26 +02:00
Laurent Destailleur
76a669a13f
Only en_US must exists into template
2021-05-03 13:12:09 +02:00
Laurent Destailleur
ba156deda3
Merge pull request #17457 from dolibit-ut/patch-310
...
Update llx_10_c_regions.sql
2021-05-03 13:09:33 +02:00
Laurent Destailleur
e9ed985e18
Fix filter
2021-05-03 12:47:40 +02:00
Laurent Destailleur
39e27b6f38
Minor perf enhancement
2021-05-03 12:32:31 +02:00
Laurent Destailleur
d7e445efbd
Better doc
2021-05-03 12:01:26 +02:00
Laurent Destailleur
9c0d4dd86b
Small performance enhancement for transfer in accountancy.
2021-05-03 11:31:16 +02:00
Laurent Destailleur
2a47128e2d
Code comment
2021-05-03 11:00:41 +02:00
Indelog
9727768192
Fix show table of pdf payments repports in file order
...
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
2021-05-03 09:46:51 +02:00
Laurent Destailleur
0aef431c2a
Move language keys
2021-05-02 18:56:40 +02:00
Laurent Destailleur
2400da497c
Exclude binary zip files
2021-05-02 16:42:22 +02:00
Laurent Destailleur
2bef447229
Clean code
2021-05-02 16:24:52 +02:00
Laurent Destailleur
6c4d0f4397
css for croping with alpha channel
2021-05-02 15:44:15 +02:00
Laurent Destailleur
efda17657d
Fix conversion in webp
2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8
Fix conversion of images
2021-05-02 15:15:27 +02:00
Laurent Destailleur
92c1022b8e
Fix duplicate in webp
2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430
Fix lang
2021-05-02 14:31:03 +02:00
UT from dolibit
5408671f8e
Update llx_10_c_regions.sql
...
Morocco - changed its regions in 2015
insert at first only a comment
check how to change for migration of old user datasets
2021-05-02 13:44:06 +02:00
UT from dolibit
9e2a987ee3
Update llx_20_c_departements.sql
...
Morocco / Maroc Provinces (have to check before/after year 2015)
2021-05-02 13:17:05 +02:00
Laurent Destailleur
71ed90a153
Fix phpcs
2021-05-02 13:16:41 +02:00
Laurent Destailleur
a54e60d345
Look and feel v14
2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e
Debug v14
2021-05-02 12:43:28 +02:00
Laurent Destailleur
88fa042c3b
Can edit language file for core modules
2021-05-02 12:39:33 +02:00
Laurent Destailleur
e8f48667dd
Enhance modulebuilder
2021-05-02 12:35:47 +02:00
Laurent Destailleur
173ef31ad4
Enhance modulebuilder
2021-05-02 12:15:31 +02:00
Laurent Destailleur
24a58b1956
Removed not used permission
2021-05-02 11:21:01 +02:00
Alexandre SPANGARO
8eddc75a22
Remove duplicate variable
2021-05-02 02:49:53 +02:00
Alexandre SPANGARO
cd6bcd14f3
NEW Accountancy - Possibility to select journals in balance
2021-05-02 02:35:16 +02:00
Alexandre SPANGARO
6b75edf2f3
NEW Accountancy - Add select date from/to in binding supplier list
2021-05-02 02:03:19 +02:00
Alexandre SPANGARO
87b9f7a77d
NEW Accountancy - Add select date from/to in already bind supplier list
2021-05-02 01:59:11 +02:00
Alexandre SPANGARO
3c01eba11a
NEW Accountancy - Add select date from/to in already bind customer list
2021-05-02 01:53:49 +02:00
Alexandre SPANGARO
0acbd87a53
NEW Accountancy - Add select date from/to in binding customer list
2021-05-02 01:47:29 +02:00
daraelmin
125162f520
Fix #17352 card number overlaps expiration date on public payment page with Stripe
2021-05-01 22:01:04 +02:00
daraelmin
1d05ce4a15
Update comment
2021-05-01 21:40:43 +02:00
kastoras
127654e792
New/NEW Product Variants API, add variant stock to response
...
Remove dependency inserded by mistake
2021-05-01 22:32:08 +03:00
daraelmin
0610ca89c1
camelCase for amountByType
2021-05-01 20:45:57 +02:00
daraelmin
28ba847709
camelCase format for method amountByType
2021-05-01 20:43:58 +02:00
stickler-ci
832ceb2be3
Fixing style errors.
2021-05-01 18:36:59 +00:00
daraelmin
b643af9c03
Remove unused code from reverted pr
2021-05-01 20:28:47 +02:00
daraelmin
031d258b32
Update newpayment.php
2021-05-01 20:17:29 +02:00
daraelmin
8457fef1a2
Update llx_adherent_type.sql
2021-05-01 20:10:17 +02:00
daraelmin
5ff60c31e6
Update 13.0.0-14.0.0.sql
2021-05-01 20:08:32 +02:00
daraelmin
4c3e37681c
Update adherent_type.class.php
2021-05-01 20:06:15 +02:00
daraelmin
5f23c68f85
Update type.php
2021-05-01 20:01:18 +02:00
Laurent Destailleur
7a986b3e50
Fix colors
2021-05-01 17:44:28 +02:00
Laurent Destailleur
c848a1ce03
css
2021-05-01 16:55:49 +02:00
Laurent Destailleur
ef734aeb58
Debug module inventory
2021-05-01 16:33:05 +02:00
Laurent Destailleur
4e7e6048de
Debug generation of webp
2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983
Debug generation of webp
2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374
Debug generation of webp
2021-05-01 15:12:30 +02:00
Laurent Destailleur
0ee1d4b322
Reduce log verbosity
2021-05-01 13:22:01 +02:00
mafzalzadeh
76f42c9b51
fixed Persian themes direction to rtl
2021-05-01 11:09:34 +04:30
Luis Fernando
6fb256822b
Update card.php: Change position(ExtraFields)
2021-04-30 21:07:24 -05:00
Laurent Destailleur
e6729355b8
Look and feel v14
2021-04-30 17:56:42 +02:00
Laurent Destailleur
6c649089b8
Fix trans
2021-04-30 17:24:07 +02:00
Laurent Destailleur
fdef17ef0c
Fix translation
2021-04-30 16:59:58 +02:00
Laurent Destailleur
3ae303758b
Fix trans
2021-04-30 16:49:52 +02:00
Laurent Destailleur
223a06b77d
Clean code
2021-04-30 16:41:41 +02:00
Laurent Destailleur
69511e2706
Debug
2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2
NEW rise code tries in digeteria customer and supplier accountant code
2021-04-30 16:08:46 +02:00
Laurent Destailleur
46f41681ff
Debug
2021-04-30 15:55:28 +02:00
Laurent Destailleur
79133d1205
Debug
2021-04-30 15:37:26 +02:00
Laurent Destailleur
278d8c1317
Debug
2021-04-30 15:34:02 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
lmarcouiller
ce677c4f27
Fix #17361 : change of llx_export_model type to varchar(64)
2021-04-30 14:50:18 +02:00
altairis-noe
c10b165d33
qc_status change in stock correct -> display select
2021-04-30 14:36:25 +02:00
Laurent Destailleur
c693668d38
Clean code
2021-04-30 14:26:39 +02:00
lmarcouiller
06e550cb19
Fix : Error on knowledgemanagement_list error $sql extrafields
2021-04-30 12:32:53 +02:00
ATM john
6e4962bb39
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection
2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8
Fix checkbox multiselect pre-selected value from get/post
2021-04-30 12:20:43 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4
...
New Module Knowledge Management
2021-04-30 12:12:15 +02:00
Laurent Destailleur
c38aabc726
Merge pull request #17440 from Hystepik/develop#1
...
Fix #17424 : preg_match error on List of purchase orders
2021-04-30 12:10:07 +02:00
Laurent Destailleur
edd178c373
Update list.php
2021-04-30 12:09:42 +02:00
Laurent Destailleur
b45ac52311
Clean sql
2021-04-30 12:07:26 +02:00
Laurent Destailleur
ac05874b53
Merge pull request #17434 from FHenry/dev_add_channel_order_list
...
NEW: add Channel column into order list
2021-04-30 12:04:24 +02:00
Laurent Destailleur
27e2c69e4e
Merge pull request #17439 from atm-lena/11.0_FIX_ShowContactSearch_SQLError
...
FIX SQL Error show_contacts : socialnetworks
2021-04-30 12:03:40 +02:00
Laurent Destailleur
baef062295
Merge pull request #17431 from dolibit-ut/patch-306
...
Update llx_20_c_departements.sql
2021-04-30 12:01:46 +02:00
Laurent Destailleur
45f9805c8b
Merge pull request #17430 from dolibit-ut/patch-305
...
Update llx_10_c_regions.sql
2021-04-30 12:00:10 +02:00
Laurent Destailleur
0d4eaca3e8
Merge pull request #17426 from daraelmin/daraelmin-patch-v11
...
Fix wrong alias in natural_search v11-v14
2021-04-30 11:58:53 +02:00
Laurent Destailleur
08c85a88c8
Merge pull request #17437 from daraelmin/daraelmin-patch-v11-2
...
Fix logical test always false V11 to v14
2021-04-30 11:57:58 +02:00
Laurent Destailleur
4bf1bde8fe
Merge pull request #17436 from frederic34/patch-3
...
fix activate cron
2021-04-30 11:55:40 +02:00
Laurent Destailleur
195163b81a
Enhance security center
2021-04-30 11:45:45 +02:00
Francis Appels
773b16928d
only if no token
2021-04-30 11:15:01 +02:00
altairis-noe
fd42979def
qc_status change in stock transfer -> display select
2021-04-30 11:12:33 +02:00
Laurent Destailleur
5a1f2db024
Clean sql
2021-04-30 10:57:21 +02:00
lmarcouiller
484f6f275f
Fix #17424 : preg_match error on List of purchase orders
2021-04-30 10:56:47 +02:00
Francis Appels
05a96b3ee2
FIX missing token on dolGetButtonAction for action delete
2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45
Fixing style errors.
2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321
FIX SQL Error show_contacts : socialnetworks
2021-04-30 10:04:21 +02:00
daraelmin
749aeeb233
Fix $objp->subscription =="yes"
2021-04-29 23:16:21 +02:00
daraelmin
4174ebd9c0
Fix subscription =="yes"
2021-04-29 23:11:51 +02:00
daraelmin
965eb2d639
Fix logical test always false
...
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
2021-04-29 22:57:39 +02:00
Frédéric FRANCE
196f8bbfb8
Update card.php
2021-04-29 22:19:05 +02:00
Frédéric FRANCE
beca2388ba
fix activate cron
2021-04-29 22:08:49 +02:00
Laurent Destailleur
8e1ba67928
css
2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb
Fix html tag
2021-04-29 18:02:24 +02:00
altairis-noe
1224327f91
qcstatus everywhere
2021-04-29 17:50:11 +02:00
stickler-ci
d5af15a102
Fixing style errors.
2021-04-29 15:37:19 +00:00
fr69400
96baa1ef49
wrong variable name
2021-04-29 17:36:45 +02:00
jpb
6aa9c35f0f
merge conflic
2021-04-29 17:34:56 +02:00
jpb
5da418ce33
merge conflict
2021-04-29 17:27:59 +02:00
Florian HENRY
fd6eacf022
NEW: add Channel column into order list
2021-04-29 16:15:46 +02:00
UT from dolibit
5f7a3571cd
Update llx_00_c_country.sql
...
countries in english
2021-04-29 16:08:27 +02:00
jpb
330c08ac13
remove number to text type input
2021-04-29 15:59:55 +02:00
UT from dolibit
2c8ab51dac
Update llx_20_c_departements.sql
...
Portugal (remove '' at fk_region)
2021-04-29 15:55:38 +02:00
Laurent Destailleur
e7e2953a9e
Look and feel
2021-04-29 15:49:44 +02:00
UT from dolibit
54ab2e523d
Update llx_10_c_regions.sql
...
Hungary - sorting & regions in hungarian
2021-04-29 15:40:45 +02:00
stickler-ci
8fda2ba2b4
Fixing style errors.
2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
altairis-noe
f3ede35b4f
lang correction
2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc
Merge branch 'develop' into batch_status_dict
2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753
merge conflict resolution
2021-04-29 13:08:24 +02:00
altairis-noe
f7182d43fd
add entity in c_productbatch_qcstatus key
2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86
llx_c_productbatch_qcstatus as dictionnary name
2021-04-29 12:49:15 +02:00
Laurent Destailleur
e3767557d8
Fix phpcs
2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81
FIX: Espadon PDF shippment model with long public note now wroking
2021-04-29 11:34:09 +02:00
lmarcouiller
4b4bf9321d
littlefix on creation
2021-04-29 10:54:24 +02:00
lmarcouiller
d4fb9c7c47
knowledgemanager finished
2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db
Fix add of box
2021-04-29 10:13:43 +02:00
Laurent Destailleur
de8e291c7e
Debug v14
2021-04-29 10:01:10 +02:00
daraelmin
68415322ec
Fix v11 wrong alias in natural_search
2021-04-29 10:00:54 +02:00
Dorian Vabre
d1fe595c09
fix on the clear ids
2021-04-29 10:00:49 +02:00
lmarcouiller
6da32015f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-04-29 09:45:30 +02:00
Dorian Vabre
df28491524
every id is now clear in url + in the hash of the securekey
2021-04-29 09:40:47 +02:00
lmarcouiller
799d1de830
Update incoice.lib.php and index.php match eldy's requests
2021-04-29 09:31:49 +02:00
Antonin MARCHAL
6dafb98707
Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop
2021-04-29 01:20:42 +02:00
Antonin MARCHAL
c89830b25b
fix(sql) pmp added to create table both migration and install
2021-04-29 01:17:21 +02:00
Laurent Destailleur
6f1f26096e
Debug partnership module
2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738
add_pdf_template_and_read_if_module_activate
2021-04-28 23:25:03 +02:00
stickler-ci
58b4074e57
Fixing style errors.
2021-04-28 21:10:06 +00:00
kastoras
eca04b675b
Merge remote-tracking branch 'origin/product_variants_api_add_stock_to_response' into product_variants_api_add_stock_to_response
2021-04-29 00:10:35 +03:00
kastoras
24dec80c7e
New/NEW Product Variants API, add variant stock to response by parameter
...
If $includestock parameter is set to 1, the response will contain variant stock data
2021-04-29 00:06:47 +03:00
Laurent Destailleur
64374f46da
Debug v14
2021-04-28 23:01:20 +02:00
Laurent Destailleur
846bab38da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 22:45:10 +02:00
Laurent Destailleur
b1d858eb26
Fix translation of new modules
2021-04-28 22:44:57 +02:00
kastoras
e5cd6f97f9
New/NEW Product Variants API, add variant stock to response
...
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
2021-04-28 23:19:24 +03:00
Laurent Destailleur
9934e28c2a
Merge pull request #17423 from FHenry/dev_new_notif_trigger
...
Add ORDER_CREATE trigger for notificiation
2021-04-28 21:39:45 +02:00
Laurent Destailleur
887bce8235
Avoid duplicate declaration
2021-04-28 20:59:21 +02:00
Laurent Destailleur
b459dbe7d8
Merge pull request #17422 from daraelmin/patch-3
...
statut is not status in adherent class
2021-04-28 20:56:23 +02:00
Laurent Destailleur
5348f13a60
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-28 20:47:43 +02:00
Laurent Destailleur
95ecb95ff1
FIX dol_print_date for %a and %b with some timezone
2021-04-28 20:47:28 +02:00
Laurent Destailleur
61fb3ed3d0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 20:44:53 +02:00
Laurent Destailleur
18e911a636
FIX dol_print_date for %a and %b with some Timezone
2021-04-28 20:44:22 +02:00
Laurent Destailleur
7b29b283a2
Merge pull request #17260 from bb2a/mass_action_order
...
NEW Add Mass action order validate and set to billed
2021-04-28 19:13:09 +02:00
Laurent Destailleur
d4651c4721
Fix trad
2021-04-28 18:32:49 +02:00
Laurent Destailleur
2dc597f5d0
Make setup easier to understand
2021-04-28 18:04:00 +02:00
Florian HENRY
8dd331d461
Add ORDER CREATE trigger for notificiation
2021-04-28 17:55:03 +02:00
daraelmin
ea5493be87
Update adherent.class.php
2021-04-28 17:54:47 +02:00
Laurent Destailleur
2738985689
Fix translation
2021-04-28 17:53:05 +02:00
stickler-ci
95389b4f57
Fixing style errors.
2021-04-28 15:33:37 +00:00
daraelmin
6b3024b153
statut is not status in adherent class
2021-04-28 17:29:52 +02:00
Laurent Destailleur
6ff9a3c922
Fix trans
2021-04-28 17:13:43 +02:00
Laurent Destailleur
d9d7019de4
Clean page
2021-04-28 17:12:34 +02:00
Laurent Destailleur
2ea1098499
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 17:09:17 +02:00
altairis-noe
82ae633617
lifetime and qc_frequency now treated in add and update
2021-04-28 17:08:17 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39
...
Maxi debug of societe/product per entity
2021-04-28 17:06:45 +02:00
Laurent Destailleur
1166dfb458
Merge pull request #17365 from Givriz/dev
...
Compatibility phpv8
2021-04-28 17:01:22 +02:00
Laurent Destailleur
367a6b15a6
Update modules.php
2021-04-28 17:00:29 +02:00
Laurent Destailleur
6b74a656ed
Merge pull request #17412 from daraelmin/daraelmin-patch-box-adhstatusconst
...
Clean code (use adh status const in boxes)
2021-04-28 16:48:31 +02:00
Laurent Destailleur
a12b6394be
Better error message
2021-04-28 16:41:37 +02:00
altairis-noe
d6b936dd6e
add lifetime and qc_frequency in product card
2021-04-28 16:36:15 +02:00
Laurent Destailleur
3ecf2015b3
Merge pull request #17393 from kastoras/product_api_get_only_products_not_variants
...
Close/CLOSE #17390 Products API, GET /products without variants
2021-04-28 16:14:01 +02:00
Laurent Destailleur
b56b9aa707
Merge branch 'develop' into develop
2021-04-28 16:05:07 +02:00
antonin_tdj
0108826ee5
add column instead of just add
2021-04-28 16:03:40 +02:00
Laurent Destailleur
b4d0549017
Clean deprecated var
2021-04-28 16:00:59 +02:00
Laurent Destailleur
9f56ce6c53
Merge pull request #17405 from Hystepik/develop#1
...
Fix #17219 : complement of PR 17161
2021-04-28 15:48:38 +02:00
Laurent Destailleur
e810118a99
Merge pull request #17408 from ibuiv/patch-7
...
Fix Bug replenish + Auto Filter
2021-04-28 15:45:57 +02:00
Laurent Destailleur
2532ca39de
Merge pull request #17414 from daraelmin/daraelmin-adhconststatus-card
...
Clean code use const adh statut instead of integer in adh card
2021-04-28 15:34:25 +02:00
Laurent Destailleur
2feca855e5
Merge pull request #17411 from daraelmin/daraelmin-patch-adh-const
...
Fix wrong set of constant
2021-04-28 15:32:41 +02:00
Laurent Destailleur
0b0d1ee832
Merge pull request #17413 from kastoras/product_api_get_product_stock
...
Close/CLOSE #13739 Product API route added to get product stock
2021-04-28 15:31:33 +02:00
lmarcouiller
d753ef6393
edit of modKnowledgeManagement.class
2021-04-28 15:28:00 +02:00
Laurent Destailleur
c946e1ad8a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 15:25:19 +02:00
Laurent Destailleur
4926ac1e24
Fix make protected method not visible
2021-04-28 15:25:06 +02:00
Laurent Destailleur
4ca4c5a0fc
Merge pull request #17417 from dolibit-ut/patch-304
...
Update llx_20_c_departements.sql
2021-04-28 15:08:36 +02:00
Laurent Destailleur
6dcee425a1
Update card.php
2021-04-28 15:07:31 +02:00
Laurent Destailleur
4a3360b992
Merge pull request #17419 from atm-gauthier/develop_fixes_on_salaries_and_vat
...
Develop fixes on salaries and vat
2021-04-28 15:04:19 +02:00
Laurent Destailleur
ba7b47d929
Merge pull request #17416 from dolibit-ut/patch-303
...
Update llx_10_c_regions.sql
2021-04-28 15:01:03 +02:00
daraelmin
bc61fdd487
Missing $
2021-04-28 14:58:13 +02:00
lmarcouiller
97043ca665
New module KnowledgeManagement
2021-04-28 14:57:49 +02:00
antonin_tdj
dfb4a1c30a
lint (code) Apply remarks and upgrade codee
...
- Sets List of all Visible Warehouses at the beginning with getEntity method (removed the call to global $mc)
- Better check for warehouse auto select (`$count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && ...`)
- Better SQL applying eldy's remarks
2021-04-28 13:37:05 +02:00
stickler-ci
762378c044
Fixing style errors.
2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
01ddc13b2e
FIX : on update current_timestamp for postgres
2021-04-28 13:06:19 +02:00
Gauthier PC portable 024
4af2f8871a
FIX : on update current_timestamp
2021-04-28 12:27:07 +02:00
Sylvain Legrand
18d2bef8f3
Error 500 on propal card when we change the deadline
...
if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
2021-04-28 11:58:34 +02:00
Gauthier PC portable 024
c25b044da5
FIX : several fixes on salary and vat
2021-04-28 11:56:07 +02:00
Laurent Destailleur
e50494152d
Fix label
2021-04-28 11:22:45 +02:00
lmarcouiller
df33f6870b
fix errors in file
2021-04-28 10:12:17 +02:00
lmarcouiller
7a49629136
first commit KnowledgeManagement
2021-04-28 10:11:49 +02:00
UT from dolibit
26a7c2613a
Update llx_20_c_departements.sql
...
Taiwan
Slovenia (need to check SI-Id)
Panama
2021-04-28 10:03:02 +02:00
UT from dolibit
29cb154028
Update llx_10_c_regions.sql
...
China
Taiwan
sorting completed
2021-04-28 09:38:19 +02:00
lmarcouiller
be22d43c60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-28 09:24:18 +02:00
lmarcouiller
7782e849e2
changes to implement eldy's advices
2021-04-28 09:22:10 +02:00
lmarcouiller
c1069c5f16
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-28 09:03:36 +02:00
daraelmin
972b325a51
Clean code
2021-04-28 08:14:18 +02:00
daraelmin
65a83036ed
Clean code use const adh statut instead of integer
2021-04-28 07:45:36 +02:00
stickler-ci
925c324872
Fixing style errors.
2021-04-27 21:38:03 +00:00
kastoras
2e108e1e2f
Close/CLOSE #13739 Product API route added to get product stock
...
Using GET /products/{id}/stock user can get product stock from all warehouses. Using warehouse id will get stock of warehouse given.
2021-04-28 00:32:37 +03:00
Laurent Destailleur
0037da1a56
FIX selection of project for reception must use
...
PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS
2021-04-27 23:29:53 +02:00
daraelmin
50a5dd7ff3
Use adh const
2021-04-27 23:28:49 +02:00
daraelmin
e7f1170736
Use adherent status const
2021-04-27 23:22:29 +02:00
kastoras
f3504e8c54
Close/CLOSE #17390 Products API, GET /products variants filter
...
Added new parameter for variants filter. Using this filter you can get products without variants only, parrent products only, child products only.
2021-04-27 23:47:00 +03:00
Laurent Destailleur
e01c5313a7
Debug v14
2021-04-27 22:36:25 +02:00
Laurent Destailleur
1e7a778ecc
Debug v14
2021-04-27 22:28:28 +02:00
Laurent Destailleur
9524f5e0a5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-27 22:14:33 +02:00
Laurent Destailleur
cb72a010cd
FIX notifications for expense report has disappeared.
2021-04-27 22:14:19 +02:00
daraelmin
c1d07a457b
Mispelling
2021-04-27 22:00:21 +02:00
daraelmin
e365337440
Use status constant instead of integer
2021-04-27 21:43:13 +02:00
Laurent Destailleur
0d30bc5dc3
Merge pull request #17366 from daraelmin/daraelmin-patch-laterenew
...
Fix #17318 false renew date
2021-04-27 21:26:56 +02:00
Laurent Destailleur
3d3e8786af
Update adherent.class.php
2021-04-27 21:24:59 +02:00
stickler-ci
d0d034672d
Fixing style errors.
2021-04-27 19:10:01 +00:00
daraelmin
082423efa0
libstatut
2021-04-27 21:09:37 +02:00
daraelmin
7f3810e703
update $field also
2021-04-27 20:53:14 +02:00
Damien BENOIT
d8ec9de58b
Update delais.php
2021-04-27 20:53:05 +02:00
daraelmin
d3c7ab402d
Fix wrong set of constant
2021-04-27 20:45:04 +02:00
daraelmin
5b74676e54
fix infinite loop
2021-04-27 20:14:03 +02:00
Laurent Destailleur
e6d2bad6e0
Update paymentok.php
2021-04-27 19:46:26 +02:00
Laurent Destailleur
035828ba51
Add missing constants
2021-04-27 19:45:56 +02:00
Laurent Destailleur
3f7f166fb6
Make option label easier to understand.
2021-04-27 19:33:11 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0
...
FIX : Add function price2num for rounding values in productAlertStock…
2021-04-27 18:45:26 +02:00
Laurent Destailleur
be541a2f82
Merge pull request #17400 from OPEN-DSI/fix_00007
...
FIX Supplier invoices (deposit, multicurrency in lines)
2021-04-27 18:43:41 +02:00
Laurent Destailleur
f6ed63c37d
Merge pull request #17409 from fr69400/develop
...
Update supplier_proposal.class.php
2021-04-27 18:39:37 +02:00
fr69400
c7c1756703
Update supplier_proposal.class.php
2021-04-27 18:22:31 +02:00
kamel
4b490d434c
Corrections
2021-04-27 18:08:05 +02:00
Laurent Destailleur
f5d18a0023
Update replenish.php
2021-04-27 18:00:45 +02:00
Laurent Destailleur
328e70c309
Update replenish.php
2021-04-27 17:52:57 +02:00
Laurent Destailleur
b1d8ca0701
Fix phpcs
2021-04-27 17:45:13 +02:00
altairis-noe
1a52ff6990
language strings
2021-04-27 17:38:32 +02:00
Laurent Destailleur
7db74c81be
Merge pull request #17410 from Hystepik/develop#3
...
Fix : Bug facture.class.php
2021-04-27 17:30:39 +02:00
Laurent Destailleur
11437a8077
css
2021-04-27 17:28:28 +02:00
Dorian Vabre
15e65729f6
put company under email in the form
2021-04-27 17:19:13 +02:00
Dorian Vabre
54b5a43006
wip
2021-04-27 17:06:25 +02:00
lmarcouiller
97633e34f2
Fix : Bug facture.class.php
2021-04-27 16:47:27 +02:00
Dorian Vabre
5203a417fe
select array OK for event type
2021-04-27 16:31:14 +02:00
lmarcouiller
a499f8f1f8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-27 16:26:06 +02:00
lmarcouiller
a2b2a35d5b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-27 16:23:55 +02:00
stickler-ci
3d38301be9
Fixing style errors.
2021-04-27 14:06:10 +00:00
lmarcouiller
52bf0f0359
Close #17271 : Replament of 2 graph in compta/index.php
2021-04-27 16:02:46 +02:00
Dorian Vabre
f2f1eaa95e
wip
2021-04-27 16:01:01 +02:00
fr69400
52f3c95429
Update supplier_proposal.class.php
2021-04-27 15:59:13 +02:00
altairis-noe
9fc67275fd
llx_c_productbatch_status to migration and translatable strings
2021-04-27 15:55:51 +02:00
altairis-noe
99df144e04
edit traceability fields in productlot card
2021-04-27 15:28:39 +02:00
Dorian Vabre
8fc45da56e
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-04-27 15:01:59 +02:00
kamel
80be0c32e4
Corrections
2021-04-27 14:13:59 +02:00
Dorian Vabre
7405725198
added security check at beginning of /project/index page (according to the security I added in the previous commits)
2021-04-27 14:11:46 +02:00
Dorian Vabre
79dce3ad05
typo in comment
2021-04-27 14:06:40 +02:00
Dorian Vabre
fab12bc5e5
removed the indicated id of conf when on the subscription page for security (now showing label instead)
2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59
every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids
2021-04-27 14:01:44 +02:00
Dorian Vabre
b24b297a40
adaptation of the payment for the booth location case
2021-04-27 12:30:49 +02:00
kamel
3a673c9210
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007
2021-04-27 12:29:10 +02:00
stickler-ci
109124fdac
Fixing style errors.
2021-04-27 10:16:59 +00:00
antonin_tdj
6fd1726093
Fix Bug replenish + Auto Filter
...
# Fix Replenish Calculation Bug + Auto Filter
## Environment
* Version: 13
* URL(s): product/stock/replenish.php
## Configuration
MultiCompany needed with Stock Sharing ON, 2 entities and 1 warehouse per entity
**Entity A**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_A)
* Stock : 1 product (PROD) Qty : 4
**Entity B :**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_B)
* Stock : 1 product --the same-- (PROD) Qty : 17
**Product :**
* Desired Stock : 20
* Alert : 10
**WAR_A :**
* For the product
* Desired Stock : 16
* Alert : 6
## Fixed behavior :
* Entity A -> Replenish
* If WAR_A selected should show the product and fill with 12 the qty to order. Physical Stock (All) and Physical Stock (this
warehouse) should be 4.
* If no Warehouse selected show the product and fill with 12 (because only one warehouse seen by this entity) the qty to order. Physical Stock (All) should be 4.
## Actual behavior :
* Entity A -> Replenish
* The product isn't showed.
* If I intentionally incrementes the Desired Stock value. The product will be shown with the good filter (Warehouse if desired stock has been incremented on the combination ProductDesired <-> Warehouse). The qty for the order are correct and the physical stock shown is correct.
## Conclusion :
* 1 bug and 1 improvment
**BUG** : The value of the stock taken to whether or not show the product line is wrong. It is considering the stock in warehouses not shared with the entity.
**IMPROVMENT** : If only one Warehouse, take automatically the desired and alert values for this warehouse and not the general ones.
2021-04-27 12:14:36 +02:00
Laurent Destailleur
ae773ff938
FIX Disabled pages must not appears into sitemap
2021-04-27 12:12:45 +02:00
kamel
c645241327
Corrections
2021-04-27 12:11:28 +02:00
Laurent Destailleur
9941236d76
Fix alternate into sitemap
2021-04-27 11:47:33 +02:00
Laurent Destailleur
071fe087fd
Fix replacement of sitemap entry in robot.txt
2021-04-27 11:29:47 +02:00
Dorian Vabre
151819b7ad
added payment redirection to pay a booth, or status update for free booth/conference
2021-04-27 11:22:40 +02:00
Laurent Destailleur
0d391ec185
Show name of sitemap file
2021-04-27 11:20:04 +02:00
lmarcouiller
8896e7c0d5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-27 11:18:33 +02:00
Antonin MARCHAL
5d1d6eee95
add(pmp) on Warehouse List
2021-04-27 10:51:15 +02:00
lmarcouiller
758ba67adc
Fix #17219 : new complement of PR 17161
2021-04-27 10:50:45 +02:00
Dorian Vabre
bfadcfc4bb
added red star on label and note, that are required
2021-04-27 10:49:10 +02:00
Dorian Vabre
d034446205
not giving the invoiceref anymore in the url from newpayment to paymentok, since it was already in ref= anyway
2021-04-27 10:08:32 +02:00
Antonin MARCHAL
00ef5b94bf
lint(stickler)
2021-04-27 09:59:33 +02:00
Antonin MARCHAL
c865199a78
lint(stickler)
2021-04-27 09:58:36 +02:00
Dorian Vabre
99589fd693
added fk_project in $facture
2021-04-27 09:57:27 +02:00
Antonin MARCHAL
5fd0c1b810
fix(code)eldy's remarks
2021-04-27 09:55:35 +02:00
Antonin MARCHAL
b573d81e45
fix(lint) eldy's remarks + other table used
2021-04-27 09:54:38 +02:00
Dorian Vabre
cedb8adfe2
removal of vardump
2021-04-27 09:52:11 +02:00
Gauthier PC portable 024
ed8b9fda13
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail
2021-04-27 09:28:08 +02:00
Adrien Raze
e8c2085abd
FIX : Change parameters MF to MS for price2num() function
2021-04-27 09:24:22 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0
Fix mass action delete of cron jobs
2021-04-27 03:16:11 +02:00
Laurent Destailleur
0c1f8b96ef
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a
Fix phpcs
2021-04-27 02:54:33 +02:00
Laurent Destailleur
5bb2531364
Enhance ticket module
2021-04-27 02:52:24 +02:00
daraelmin
db92de2a22
Draft and resiliated member could (re)validate
2021-04-27 02:36:47 +02:00
Laurent Destailleur
ea19747bc6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b
Fix phpcs
2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0
Fix bad var
2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7
Fix bad merge
2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48
Fix bad merge
2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad
Remove $_REQUEST
2021-04-27 02:01:46 +02:00
Laurent Destailleur
ea040a423f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-27 01:58:30 +02:00
Laurent Destailleur
48a50f3b10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
2021-04-27 01:58:19 +02:00
daraelmin
25e3beb3ee
$object::STATUS_RESILIATE
2021-04-27 01:55:51 +02:00
Laurent Destailleur
b3f8a6758e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link
...
FIX : type link extrafield case for advanced target emailing
2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php
2021-04-27 01:45:10 +02:00
Laurent Destailleur
e026b92a99
Merge pull request #17354 from aspangaro/13p9
...
FIX Accountancy - Quadra export - wrong data on credit
2021-04-27 01:32:45 +02:00
Laurent Destailleur
f932da97ae
Merge pull request #17350 from dolibit-ut/patch-300
...
Update bom_list.php
2021-04-27 01:32:15 +02:00
Laurent Destailleur
56177da58c
Merge pull request #17349 from dolibit-ut/patch-299
...
Update bom_document.php
2021-04-27 01:32:05 +02:00
Laurent Destailleur
f83717b54e
Merge pull request #17348 from dolibit-ut/patch-298
...
Update bom_card.php
2021-04-27 01:31:54 +02:00
Laurent Destailleur
5849c01387
Merge pull request #17347 from dolibit-ut/patch-297
...
Update bom_agenda.php
2021-04-27 01:31:39 +02:00
Laurent Destailleur
5bd13d6daa
Merge pull request #17344 from altairis-noe/product_card_typo
...
product card typo
2021-04-27 01:31:11 +02:00
Laurent Destailleur
32970b78ee
Merge pull request #17359 from FHenry/13.0
...
fix: add some .gitignore for module builder template
2021-04-27 01:30:43 +02:00
Laurent Destailleur
890c053deb
Merge pull request #17353 from dolibit-ut/patch-301
...
Update llx_20_c_departements.sql
2021-04-27 01:30:17 +02:00
Laurent Destailleur
a6fda78023
Merge pull request #17364 from Robin-Yann/13-company-disable-workflow
...
NEW Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
2021-04-27 01:29:38 +02:00
Laurent Destailleur
9579533f4f
Merge pull request #17346 from dolibit-ut/patch-296
...
Update element.php
2021-04-27 01:23:59 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php
2021-04-27 01:17:26 +02:00
Laurent Destailleur
539954f760
Clean code
2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a
Clean code
2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6
Add method checkValForAPI to clean data from API input
2021-04-27 01:05:14 +02:00
Laurent Destailleur
29b1f2b58a
Look and feel v14
2021-04-27 00:48:39 +02:00
Anthony Berton
e7242cb87f
next
2021-04-27 00:23:59 +02:00
Anthony Berton
6353084777
init
2021-04-27 00:22:39 +02:00
Laurent Destailleur
5bfedbc248
Fix regression
2021-04-27 00:20:51 +02:00
Laurent Destailleur
bbcf206336
Merge pull request #17370 from cfoellmann/fix-bookmarks
...
NEW Make public bookmarks editable by admin users only
2021-04-27 00:13:25 +02:00
stickler-ci
1c1e111b0c
Fixing style errors.
2021-04-26 22:06:11 +00:00
kastoras
8ba08552ca
New/NEW Product Variants API, add variant stock to response
...
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
2021-04-27 01:01:27 +03:00
Laurent Destailleur
fa1ad82663
Fix id in comment
2021-04-26 23:42:49 +02:00
Laurent Destailleur
566a9da56a
Merge pull request #17367 from dolibit-ut/patch-302
...
Update llx_10_c_regions.sql
2021-04-26 23:40:33 +02:00
Laurent Destailleur
5f4fe20756
Merge pull request #17371 from ksar-ksar/13.0
...
FIX #17363
2021-04-26 23:39:52 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
...
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement
...
Add : register donation payment when public payment
2021-04-26 22:46:48 +02:00
Laurent Destailleur
b96205d968
Merge pull request #17374 from Robin-Yann/13-fix-contact_filer-fournisseur
...
FIX List contact TAG filter fournisseur
2021-04-26 22:43:12 +02:00
Laurent Destailleur
3d5002b8f6
Update list.php
2021-04-26 22:42:40 +02:00
Laurent Destailleur
615f858ecb
Merge pull request #17384 from ibuiv/patch-5
...
Product Stock Card - add new standard Hooks
2021-04-26 22:40:38 +02:00
Laurent Destailleur
f0eef3a6de
Merge pull request #17375 from indelog/fix_adhpayextid
...
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
3d287dcd89
Merge pull request #17376 from indelog/fix_emptymail_adhnewpubform
...
Fix : empty email on public membership form
2021-04-26 21:22:43 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
...
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
8e67af8d58
Update api_products.class.php
2021-04-26 21:09:56 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments
...
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 21:08:29 +02:00
Laurent Destailleur
a29c26f299
Fix amount chosen lost
2021-04-26 21:07:46 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
...
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Antonin MARCHAL
a296f81bc6
lint(travis)
2021-04-26 20:30:21 +02:00
Antonin MARCHAL
c0b6dd92d7
lint(stickler)4th
2021-04-26 20:15:32 +02:00
Antonin MARCHAL
57118da206
lint(stickler)3rd
2021-04-26 20:13:55 +02:00
Antonin MARCHAL
285fa4a506
lint(stickler) again
2021-04-26 20:10:57 +02:00
Antonin MARCHAL
1d162cc62c
lint(stickler)
2021-04-26 20:06:45 +02:00
Laurent Destailleur
8f7dd6211e
fix css
2021-04-26 19:55:46 +02:00
Antonin MARCHAL
14269ab8ee
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2021-04-26 19:30:00 +02:00
Antonin MARCHAL
9e2ee5bf57
add(pmp) PMP per entity
2021-04-26 19:29:56 +02:00
Laurent Destailleur
c849ce79e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-26 19:21:38 +02:00
Laurent Destailleur
b0fe08e411
Clean code
2021-04-26 19:21:23 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
kamel
9f3bcbc39d
Fix Stickler CI
2021-04-26 17:48:42 +02:00
Dorian Vabre
a3628954b2
fix for the supplier code
2021-04-26 17:46:30 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
stickler-ci
a8136a00b1
Fixing style errors.
2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd
space stickler
2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6
fix the productCombination class on updatePrice
2021-04-26 17:00:53 +02:00
Dorian Vabre
c8440a6283
fix on form dates
2021-04-26 16:17:42 +02:00
lmarcouiller
080bd90c93
Fix #17219 : complement of PR 17161
2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9
Fixing style errors.
2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc
Clean code
2021-04-26 15:44:24 +02:00
Dorian Vabre
a716973757
form completed, tags added to thirdparty
2021-04-26 15:44:08 +02:00
stickler-ci
6387b929cc
Fixing style errors.
2021-04-26 12:30:44 +00:00
Dorian Vabre
dd9c42876a
cleared test modif on core
2021-04-26 14:29:28 +02:00
Robin-Yann
9fc0416664
Update card.php
2021-04-26 14:28:43 +02:00
Dorian Vabre
1b4b93bc6a
thirdparty/contact creation seems ok
2021-04-26 14:28:37 +02:00
Robin-Yann
c1f3626cd7
Update card.php
2021-04-26 14:11:24 +02:00
Alexandre SPANGARO
d95be3e08b
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-26 13:53:16 +02:00
Gauthier PC portable 024
5ef22327a2
FIX : last modif date for salary
2021-04-26 12:29:17 +02:00
Dorian Vabre
de63c93ad4
wip on creating the contact
2021-04-26 12:09:39 +02:00
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +02:00
Gauthier PC portable 024
3920050186
FIX : useless column
2021-04-26 11:35:33 +02:00
Dorian Vabre
bced3d60dd
added required name to the form
2021-04-26 11:11:23 +02:00
Gauthier PC portable 024
ae1586fcc6
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 10:48:50 +02:00
Dorian Vabre
45531d0f1a
index suggestion page form added, needs to be improved to show only necessary fields
2021-04-26 10:39:22 +02:00
Laurent Destailleur
c9d6bc70e8
Clean code
2021-04-26 10:22:28 +02:00
Robin-Yann
676067eafc
Update card.php
2021-04-26 10:21:25 +02:00
Dorian Vabre
1b7854e698
added security to suggestion page index.php (securekey and id encoded)
2021-04-26 10:15:28 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Robin
04c97d2695
FIX combo Prospect / Customers / Supplier in society list
2021-04-26 09:05:47 +02:00
Christian Foellmann
6b4ee56f10
fix missing backets
2021-04-26 08:40:24 +02:00
Laurent Destailleur
c3d3b79315
Fix test on Local url
2021-04-25 22:11:57 +02:00
Laurent Destailleur
bc0f220ee3
Fix web site
2021-04-25 22:02:28 +02:00
Laurent Destailleur
de00603106
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-25 20:28:15 +02:00
Laurent Destailleur
d65554f5ab
Fix phpcs
2021-04-25 20:27:53 +02:00
stickler-ci
296d19ac8b
Fixing style errors.
2021-04-25 18:25:32 +00:00
Laurent Destailleur
d6ce4e1086
Allow option to restrict API endpoints
2021-04-25 20:23:41 +02:00
Laurent Destailleur
73c482ca64
Fix escape
2021-04-25 19:36:48 +02:00
Laurent Destailleur
a8939377de
Escape string
2021-04-25 19:31:19 +02:00
Laurent Destailleur
389b71bc7e
Clean API
2021-04-25 19:21:48 +02:00
Laurent Destailleur
5d0e93344b
Upgrade to swagger 2.2
2021-04-25 17:41:59 +02:00
Laurent Destailleur
e057f44293
Typo
2021-04-25 16:15:15 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
stickler-ci
a8563de1c4
Fixing style errors.
2021-04-25 13:34:26 +00:00
Laurent Destailleur
e780bae77f
css
2021-04-25 15:27:10 +02:00
Laurent Destailleur
2fd2c67139
Clean edit of user card
2021-04-25 15:21:31 +02:00
kastoras
474bfdd6bc
Close/CLOSE #17390 Products API, GET /products without variants
...
When accessing get /products, using $without_variants parameter to true (the deault value is false), the api retur only products and no variants.
2021-04-25 16:20:17 +03:00
Laurent Destailleur
6c2d9d3b3c
Fix permission to reopen invoice.
2021-04-25 13:17:47 +02:00
Laurent Destailleur
42938ffe31
FIX #yogosha5879
2021-04-24 21:15:09 +02:00
Laurent Destailleur
ac68599fab
Fix #yogosha5877
2021-04-24 21:02:48 +02:00
Laurent Destailleur
b2c2c55214
Fix #yogosha5877
2021-04-24 21:00:26 +02:00
Laurent Destailleur
9f03054fc4
Fix #yogosha5877
2021-04-24 20:52:48 +02:00
Laurent Destailleur
24a4c09613
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-24 20:18:27 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Laurent Destailleur
db6bcd180c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-24 18:52:41 +02:00
Laurent Destailleur
48c26fd614
Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature
2021-04-24 18:43:24 +02:00
Florian HENRY
bc924ca00e
.gitignre
2021-04-24 18:27:43 +02:00
Florian HENRY
8b49585b64
fix: return invoice id when create from order
2021-04-24 18:21:36 +02:00
Alexandre SPANGARO
f60df8964a
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-24 08:05:00 +02:00
stickler-ci
9fbb5087b9
Fixing style errors.
2021-04-23 16:05:24 +00:00
antonin_tdj
a28402e3a0
Product Stock Card - add new standard Hooks
2021-04-23 18:03:16 +02:00
Givriz
a451fee68f
Compatibility phpv8
2021-04-23 18:01:11 +02:00
stickler-ci
7f9f67e7ef
Fixing style errors.
2021-04-23 15:12:34 +00:00
Dorian Vabre
e9b35cf36b
mail template modified to add company name and remove useless payment link
2021-04-23 16:53:34 +02:00
Dorian Vabre
f65fa98c37
indent fix, validation and mail sending put into else block to avoid errors
2021-04-23 16:46:09 +02:00
Dorian Vabre
f8479b4a57
fixed invoice validation, payment, and attendee validation
2021-04-23 16:37:39 +02:00
atm-lena
3d3fb17da3
Add parameter "option" to hook formattachOptions
2021-04-23 15:41:43 +02:00
altairis-noe
09807706f0
first try on productlot traceability fields
2021-04-23 14:51:02 +02:00
Adrien Raze
c5775cc902
FIX : Add parameter to function price2num()
2021-04-23 12:31:45 +02:00
Dorian Vabre
1511bf811c
now getting the amount of the invoice in the newpayment page
2021-04-23 12:22:03 +02:00
Adrien Raze
2ab17c44e9
FIX : Add function price2num for rounding values in productAlertStock box
2021-04-23 11:11:47 +02:00
Dorian Vabre
432bdaea65
same as previous commit
2021-04-23 10:36:12 +02:00
Dorian Vabre
b441c600bb
fixing error introduced in a previous commit
2021-04-23 10:32:28 +02:00
Dorian Vabre
4589813d3f
added thirdparty fetch before mail sending to get its name
2021-04-23 09:46:02 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for
...
(English below)
Bonjour,
Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT) de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Amicalement,
Gaëtan.
(English below)
Hello,
Here is a proposal to add functionality to easily activate the SpellCheckAsYouType (SCAYT) plugins of CKEditor, for the history see this thread on the Dolibarr forum:
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Kind regards,
Gaëtan.
2021-04-23 00:45:07 +02:00
stickler-ci
e7a4699bd9
Fixing style errors.
2021-04-22 17:26:46 +00:00
Indelog
196ebbb8e8
Fix : empty email on public membership form
...
We can validate the public membership form whith an empty email when
`$conf->global->ADHERENT_MAIL_REQUIRED` is set. This fix it.
2021-04-22 19:18:47 +02:00
Indelog
78a6284bd2
Fix : missig ext_payment_id on adh public pay
...
When pay a mebership contibution whit public link the payment add add in
database don't have a "ext_payment_id". This fix it.
2021-04-22 18:01:52 +02:00
stickler-ci
ed923253bd
Fixing style errors.
2021-04-22 15:23:37 +00:00
Robin-Yann
4505ba0fc8
Merge branch 'develop' into 13-fix-contact_filer-fournisseur
2021-04-22 17:21:09 +02:00
Robin
379cb74cd9
FIX tag selector error if supplier disable
2021-04-22 17:09:33 +02:00
Indelog
4d907ef443
Fix Stickler
2021-04-22 17:04:35 +02:00
stickler-ci
d6954b2826
Fixing style errors.
2021-04-22 14:56:15 +00:00
Indelog
eb52f5daa0
Add : register donation payment when public payment
...
- When we paid a donation whit public link, create the associated payment and
put its status to payed if all the promised amount is it.
- Set the amount to pay on public page depending to the rest to pay for
the don.
2021-04-22 16:32:05 +02:00
Dorian Vabre
f832434ce3
removing mistake from last commit: source is already given in urlok
2021-04-22 16:17:22 +02:00
Marc de Lima Lucio
ce022ab36c
FIX: payment validation: invoices PDF were no re-generated, make it with correct display options
2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470
FIX: payment creation: re-generate invoice PDF with correct display options
2021-04-22 15:56:12 +02:00
Dorian Vabre
804547997b
removed obsolete post information and now giving the source in the url
2021-04-22 15:52:45 +02:00
ksar
efcc5e714a
FIX #17363
2021-04-22 15:49:37 +02:00
Dorian Vabre
eb96d5bd58
added comments
2021-04-22 15:27:16 +02:00
Christian Foellmann
3573baf3ed
fix bookmarks to allow Public items to be set and deleted by admins
2021-04-22 15:24:26 +02:00
Dorian Vabre
467595ce60
an already subscribed attendee will not be redirected to a payment page, now
2021-04-22 14:53:32 +02:00
Dorian Vabre
e6318eb4f4
style
2021-04-22 12:06:33 +02:00
Dorian Vabre
e05c318fd8
various modifications on the way existing attendees and thirdparties are handled at registration
2021-04-22 11:45:00 +02:00
UT from dolibit
c43863c2a8
Update llx_10_c_regions.sql
...
Peru
Hungary
2021-04-22 11:22:40 +02:00
daraelmin
be9986f47b
Missing $
2021-04-21 21:23:14 +02:00
Givriz
3c49a2b49a
Compatibility phpv8
2021-04-21 18:59:25 +02:00
Dorian Vabre
22dab0e0af
fix on creating attendee
2021-04-21 17:26:46 +02:00
Dorian Vabre
1700ac937a
wip on looking for existing attendees instead of creating them each time
2021-04-21 17:25:28 +02:00
stickler-ci
166a23004c
Fixing style errors.
2021-04-21 15:04:44 +00:00
Robin-Yann
3227b97898
Merge branch 'develop' into 13-company-disable-workflow
2021-04-21 17:02:37 +02:00
Dorian Vabre
b9408d6c71
email sending added in paymentok
2021-04-21 16:43:57 +02:00
Dorian Vabre
e81637b608
wip on getting the existing attendee
2021-04-21 16:37:02 +02:00
stickler-ci
3b9ff839a7
Fixing style errors.
2021-04-21 14:14:47 +00:00
root
c5b0a1b02c
Merge remote-tracking branch 'origin/13.0' into 13-company-disable-workflow
2021-04-21 15:38:46 +02:00
Dorian Vabre
ebf2466d7b
no more redirection to subscriptionok after paymentok successful
2021-04-21 15:36:07 +02:00
Dorian Vabre
8e7043eca6
conforbooth class included in paymentok page
2021-04-21 15:31:14 +02:00
Dorian Vabre
4d20079c49
fix: the ref passed in url is now attendee s one, not invoice s
2021-04-21 15:20:08 +02:00
Dorian Vabre
f059cbe89c
ref passed in url no longer crypted (useless) and correctly passed through POST at submit
2021-04-21 14:50:50 +02:00
Dorian Vabre
9809179aa4
securekey added to newpayment page, correction in the invoice line created
2021-04-21 14:19:07 +02:00
Dorian Vabre
780b3f4714
target:blank added for the link to the registration pag
2021-04-21 13:41:30 +02:00
Dorian Vabre
7a65a1768a
wip on mail content
2021-04-21 11:57:03 +02:00
Dorian Vabre
790ff0c64c
mail template working, but info in it not replaced by values
2021-04-21 10:48:37 +02:00
altairis-noe
86812c13ee
no double quote
2021-04-21 09:18:40 +02:00
daraelmin
5fe9815570
Update paymentok.php
2021-04-20 23:54:33 +02:00
Florian HENRY
95c7657ace
add gitingore for modulebuilders
2021-04-20 20:21:24 +02:00
Dorian Vabre
4c57a6c207
wip on mail, sending ok but no content
2021-04-20 17:28:18 +02:00
altairis-noe
f1d68c201b
conflict resolution
2021-04-20 16:56:15 +02:00
Dorian Vabre
5ad64640c2
removal of var_dump
2021-04-20 16:26:11 +02:00
altairis-noe
d340e21cb3
No translation for dictionary labels
2021-04-20 16:13:36 +02:00
Dorian Vabre
a500d83c0b
linked invoice and attendee
2021-04-20 16:09:22 +02:00
altairis-noe
07cd751c59
batch status dictionnary
2021-04-20 15:51:02 +02:00
Dorian Vabre
b70e477f47
removal of the mail sending (not functional yet) in the subscriptionok page, it will be moved to the paymentok after payment or the attendeesubscription if no payment has to be done
2021-04-20 14:49:11 +02:00
Dorian Vabre
2cde31d17c
creation of ATT and BOO payment event
2021-04-20 14:39:41 +02:00
Alexandre SPANGARO
1729497d62
FIX Accountancy - Quadra export - wrong data on credit
2021-04-20 13:56:58 +02:00
Laurent Destailleur
891de3350f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62
FIX pb when saving some export profiles
2021-04-20 13:30:18 +02:00
UT from dolibit
771afbc195
Update llx_20_c_departements.sql
...
Italy new
2021-04-20 13:10:29 +02:00
Laurent Destailleur
1bd2bd3237
Fix php8 warning
2021-04-20 12:46:41 +02:00
Dorian Vabre
d0d0e0390b
wip on mail
2021-04-20 12:28:34 +02:00
Laurent Destailleur
db5fb42c11
css
2021-04-20 12:27:00 +02:00
Laurent Destailleur
14f009f550
Fix CURLOPT_CONNECT_TO
2021-04-20 12:19:46 +02:00
Laurent Destailleur
455d5233e6
Fix trans
2021-04-20 11:58:51 +02:00
Laurent Destailleur
f1f63cd4e2
Enhance detection of update available
2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb
Add the setup page of module accounting to not search where is setup
2021-04-20 11:40:43 +02:00
UT from dolibit
792c865ac0
Update bom_list.php
...
new: $help_url = 'EN:Module_BOM';
moved up: llxHeader('', $title, $help_url);
2021-04-20 11:39:27 +02:00
UT from dolibit
634d638a16
Update bom_document.php
...
$help_url = 'EN:Module_BOM';
2021-04-20 11:35:33 +02:00
Dorian Vabre
529909c3d1
wip on sending mails
2021-04-20 11:35:31 +02:00
UT from dolibit
cce6224c91
Update bom_card.php
...
$help_url ='EN:Module_BOM';
llxHeader('', $title, $help_url);
2021-04-20 11:33:47 +02:00
UT from dolibit
3a1f70fe34
Update bom_agenda.php
...
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
2021-04-20 11:31:45 +02:00
UT from dolibit
53a89180d9
Update element.php
...
merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
2021-04-20 11:22:12 +02:00
Dorian Vabre
5c490ca57e
security added to subscriptionok page
2021-04-20 10:56:45 +02:00
Dorian Vabre
3b17a0d66a
wip on paymentok page
2021-04-20 10:42:50 +02:00
Dorian Vabre
b43e85dbf4
added global dolibarr_main_instance_unique_id in attendeesubscription page
2021-04-20 10:27:32 +02:00
Dorian Vabre
7405813ad0
now displays only buttons if the corresponding boolean is checked
2021-04-20 10:24:36 +02:00
altairis-noe
81907191ca
product card typo
2021-04-20 10:17:08 +02:00
Gauthier PC portable 024
70f739b332
Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail
2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea
NEW : help text
2021-04-20 10:02:53 +02:00
Dorian Vabre
f82d1d246d
cleanup on the index registration page
2021-04-20 09:45:32 +02:00
Gauthier PC portable 024
cbfb2d9b47
Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail
2021-04-20 09:44:24 +02:00
Gauthier PC portable 024
e5df10133e
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0_new_collapse_batch_detail
2021-04-20 09:06:05 +02:00
Alexandre SPANGARO
d27030df3f
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00
Revert "Split mod fournisseur"
...
This reverts commit 78dbf4f7ff
2021-04-20 04:42:51 +02:00
Laurent Destailleur
39654260d6
Sync transifex
2021-04-20 00:45:48 +02:00
Laurent Destailleur
22daecbeec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-19 22:52:26 +02:00
Laurent Destailleur
ea97992c3d
css
2021-04-19 22:52:13 +02:00
Anthony Berton
d294bd544d
Update list.php
2021-04-19 22:42:38 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product
...
Batch mask product
2021-04-19 22:16:22 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop
...
NEW : Add possibility to exports userGroups fields on user exports
2021-04-19 21:58:38 +02:00
Laurent Destailleur
5181e88f83
Merge pull request #17275 from DorianVabre/dev_EventOrganizer
...
Dev event organizer: changes on the fields required on the conference attendee subscription page
2021-04-19 21:50:22 +02:00
Laurent Destailleur
96022a20d5
Merge pull request #17302 from aspangaro/14a40
...
Facture_fourn - Field tva is deprecated
2021-04-19 21:49:48 +02:00
Laurent Destailleur
74f48d082d
Merge branch 'develop' into fix_rebuild_sequence_for_postgres
2021-04-19 21:46:49 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1
...
Compatibility phpv8
2021-04-19 21:44:25 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38
...
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-19 21:42:13 +02:00
Laurent Destailleur
cc25a45767
Merge branch 'develop' into daraelmin-patch-2
2021-04-19 21:40:25 +02:00
Laurent Destailleur
9acf0e880e
Fix ident
2021-04-19 21:37:33 +02:00
Laurent Destailleur
5649998870
Merge pull request #17303 from daraelmin/daraelmin-patch-newmemberform
...
Fix new member form use getpost instead FORCEXXX
2021-04-19 21:35:23 +02:00
Laurent Destailleur
da36ed5dfe
Merge pull request #17297 from dolibit-ut/patch-278
...
Update llx_20_c_departements.sql
2021-04-19 21:30:49 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module
2021-04-19 21:26:01 +02:00
Laurent Destailleur
b00628118a
Merge pull request #17310 from OGPayet/fix/addMissingFromHookInFichinterList
...
fix add missing printFieldListFrom hook in fichinter list
2021-04-19 21:16:25 +02:00
Laurent Destailleur
3836481a1e
Update multicurrency_rate.php
2021-04-19 21:15:09 +02:00
Laurent Destailleur
4797c137e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-19 21:12:19 +02:00
Laurent Destailleur
294cf6cc31
Merge pull request #17312 from prietojc/patch-16
...
Update bonprelevement.class.php
2021-04-19 21:12:06 +02:00
Laurent Destailleur
c03baad319
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-19 21:11:07 +02:00
Laurent Destailleur
d6df32eee9
Add invoice id into EndToEnd to guarantee unicity of value.
2021-04-19 21:10:53 +02:00
Laurent Destailleur
7988aaf88f
Update bonprelevement.class.php
2021-04-19 21:02:29 +02:00
Laurent Destailleur
b67e6e8ff7
Merge pull request #17315 from fr69400/develop
...
Update supplier_proposal\contact.php
2021-04-19 21:00:45 +02:00
Laurent Destailleur
2df9e69293
Merge pull request #17320 from dolibit-ut/patch-279
...
Update agenda.php
2021-04-19 21:00:02 +02:00
Laurent Destailleur
46ea1084f5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/extrafieldsinexport.inc.php
htdocs/product/stock/card.php
2021-04-19 20:59:10 +02:00
Laurent Destailleur
28f0c6c7cf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/stock/card.php
2021-04-19 20:55:09 +02:00
Laurent Destailleur
33532707dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-19 20:49:42 +02:00
Laurent Destailleur
3df79dd3c8
Avoid error on PHP 5.6
2021-04-19 20:49:31 +02:00
Laurent Destailleur
4fbeda25da
Merge pull request #17328 from dolibit-ut/patch-284
...
Update index.php
2021-04-19 20:29:04 +02:00
Laurent Destailleur
7eed8ce370
Merge pull request #17327 from dolibit-ut/patch-283
...
Update document.php
2021-04-19 20:27:49 +02:00
Laurent Destailleur
d42c330a7c
Merge pull request #17324 from dolibit-ut/patch-281
...
Update index.php
2021-04-19 20:27:28 +02:00
Laurent Destailleur
168198c156
Merge pull request #17325 from dolibit-ut/patch-282
...
Update llx_10_c_regions.sql
2021-04-19 20:22:13 +02:00
Laurent Destailleur
398800ef68
Merge pull request #17329 from dolibit-ut/patch-285
...
Update list.php
2021-04-19 20:21:36 +02:00
Laurent Destailleur
1a6df3f3cc
Merge pull request #17335 from dolibit-ut/patch-291
...
Update comment.php
2021-04-19 20:21:08 +02:00
Laurent Destailleur
d1fb1e4fea
Merge pull request #17331 from dolibit-ut/patch-287
...
Update mo_movements.php
2021-04-19 20:20:31 +02:00
Laurent Destailleur
1adffc4b05
Update mo_movements.php
2021-04-19 20:20:23 +02:00
Laurent Destailleur
9bf5614922
Merge pull request #17330 from dolibit-ut/patch-286
...
Update mo_card.php
2021-04-19 20:19:39 +02:00
Laurent Destailleur
468d44a23b
Merge pull request #17333 from dolibit-ut/patch-289
...
Update admin_establishment.php
2021-04-19 20:19:16 +02:00
Laurent Destailleur
8f6d842a68
Merge pull request #17332 from dolibit-ut/patch-288
...
Update index.php
2021-04-19 20:19:06 +02:00
Laurent Destailleur
4bf631dc90
Merge pull request #17334 from dolibit-ut/patch-290
...
Update admin_hrm.php
2021-04-19 20:18:58 +02:00
Laurent Destailleur
26d49c6e23
Merge pull request #17336 from dolibit-ut/patch-292
...
Update contact.php
2021-04-19 20:18:51 +02:00
Laurent Destailleur
7b0ed67181
Merge pull request #17337 from dolibit-ut/patch-293
...
Update document.php
2021-04-19 20:18:42 +02:00
Laurent Destailleur
0b634b2a77
Merge pull request #17338 from dolibit-ut/patch-294
...
Update element.php
2021-04-19 20:18:06 +02:00
UT from dolibit
b8fbfd5078
Update index.php
...
new: $help_url
add DE:Modul_Projekte
" " => ' '
llxHeader('', $title, $help_url);
2021-04-19 18:24:19 +02:00
stickler-ci
8437761bb6
Fixing style errors.
2021-04-19 16:15:07 +00:00
UT from dolibit
0f8ef61d34
Update element.php
...
$title / $help_url / llxHeader " " => ' '
add DE:Modul_Projekte
llxHeader('', $title, $help_url);
2021-04-19 18:13:06 +02:00
stickler-ci
8db9b5bb22
Fixing style errors.
2021-04-19 16:10:55 +00:00
UT from dolibit
b78f85b959
Update document.php
...
$title / $help_url " " => ' '
add DE:Modul_Projekte
2021-04-19 18:08:36 +02:00
stickler-ci
6fff8baac5
Fixing style errors.
2021-04-19 16:07:19 +00:00
UT from dolibit
a886725b1c
Update contact.php
...
$title / $help_url " " => ' '
add DE:Modul_Projekte
2021-04-19 18:05:18 +02:00
UT from dolibit
00eda15ac6
Update comment.php
...
$title = $langs->trans('CommentPage');
llxHeader('', $title, '');
2021-04-19 17:58:14 +02:00
UT from dolibit
985dc83b8c
Update admin_hrm.php
...
$title = $langs->trans('Parameters');
llxHeader('', $title, '');
2021-04-19 17:53:29 +02:00
UT from dolibit
f2781ee017
Update admin_establishment.php
...
$title = $langs->trans('Establishments');
llxHeader('', $title, '');
2021-04-19 17:51:52 +02:00
UT from dolibit
ec97c5aa09
Update index.php
...
$title = $langs->trans('HRMArea');
llxHeader('', $title, '');
2021-04-19 17:50:13 +02:00
UT from dolibit
38d7143392
Update mo_movements.php
...
$help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
2021-04-19 17:46:20 +02:00
UT from dolibit
333fb2d881
Update mo_card.php
...
$title = $langs->trans('Mo')." - ".$langs->trans("Card");
2021-04-19 17:40:23 +02:00
UT from dolibit
9b9ddc2c3c
Update list.php
...
$xxxx_start / $xxxx_end : " " => ' '
2021-04-19 17:37:08 +02:00
stickler-ci
d9db752339
Fixing style errors.
2021-04-19 15:32:00 +00:00
UT from dolibit
e7ee46049f
Update index.php
...
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
2021-04-19 17:29:52 +02:00
UT from dolibit
8fc3f9c919
Update document.php
...
$helpurl => $help_url
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
2021-04-19 17:28:13 +02:00
Dorian Vabre
128dcb2e2b
public registration page for booths and conferences created, wip
2021-04-19 17:26:01 +02:00
Laurent Destailleur
4d916f3c9f
Fix perm
2021-04-19 17:23:16 +02:00
Dorian Vabre
ac8ddd8831
removed redundant fetch
2021-04-19 16:52:08 +02:00
Dorian Vabre
18d16d9509
moved attendee validation after the payment method search
2021-04-19 16:26:45 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
Dorian Vabre
1b947a6e9a
added index page for the booth/conference registration
2021-04-19 16:17:11 +02:00
atm-greg
74345c4f21
fix warehouse label field edition
2021-04-19 16:03:22 +02:00
Dorian Vabre
9a32526938
added space for the link to the conference/booth registration page
2021-04-19 15:49:51 +02:00
UT from dolibit
0f0bd34d29
Update llx_10_c_regions.sql
...
-- Mauritius
-- Venezuela
-- United Arab Emirates
-- Portugal
-- Slovenia (correction fk_pays)
2021-04-19 15:38:44 +02:00
Laurent Destailleur
b5868acf18
Fix phpcs
2021-04-19 15:30:30 +02:00
Laurent Destailleur
634c38e948
Fix escape
2021-04-19 15:28:49 +02:00
Laurent Destailleur
474bf5cfd9
Show MAIN_SECURITY_ANTI_SSRF_SERVER_IP option into security page
2021-04-19 15:26:24 +02:00
stickler-ci
1d27bc461a
Fixing style errors.
2021-04-19 13:24:14 +00:00
UT from dolibit
e43b180e1b
Update index.php
...
add comments
// init API
// init PHPUnit
// init ExtraFields
// init Hook
// init Trigger
// init Widget
// init CSS
// init JS
// init CLI
// init Doc
// add Language
// remove/delete File
2021-04-19 15:22:07 +02:00
Dorian Vabre
8a43dac46d
now giving the invoice id to the payment validation page so it can validate the payment
2021-04-19 15:21:16 +02:00
Laurent Destailleur
a8187af8ef
Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP.
2021-04-19 15:16:00 +02:00
Laurent Destailleur
2cd9289de1
Fix error message
2021-04-19 15:09:13 +02:00
Laurent Destailleur
de4d5f3888
Check file name end with .xml
2021-04-19 15:07:07 +02:00
Laurent Destailleur
08ded970e2
NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
2021-04-19 15:01:36 +02:00
Laurent Destailleur
238e8a17b0
Better error message
2021-04-19 14:54:58 +02:00
NextGestion
da0067ff6c
Fixing error
2021-04-19 13:51:50 +01:00
Gauthier PC portable 024
b87773d5a0
Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into 13.0_new_collapse_batch_detail
2021-04-19 14:47:29 +02:00
Gauthier PC portable 024
2236d1b07f
FIX : Hide all and check all links always available
2021-04-19 14:46:28 +02:00
NextGestion
ea97cf5baf
Change translate file
2021-04-19 13:46:21 +01:00
stickler-ci
a79823742f
Fixing style errors.
2021-04-19 12:41:17 +00:00
NextGestion
f396160bb8
Fixing error.
2021-04-19 13:39:50 +01:00
stickler-ci
6f32b2edda
Fixing style errors.
2021-04-19 13:23:36 +00:00
Gauthier PC portable 024
894eb1e5a4
NEW : "+" and "-" to show / hide batch details on product "stock" tab
2021-04-19 14:34:11 +02:00
Laurent Destailleur
d8f387938c
Try to use 2 different names for operation
2021-04-19 14:30:09 +02:00
jpb
31a3c623f4
remove ->escape
2021-04-19 14:24:56 +02:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
Laurent Destailleur
379f105e4c
Trans
2021-04-19 14:18:41 +02:00
UT from dolibit
6116e22ed5
Update agenda.php
...
$wikihelp => $help_url
2021-04-19 14:15:16 +02:00
jpb
2c4e6da36a
add escape to date
2021-04-19 14:02:46 +02:00
Laurent Destailleur
0537fdd1c6
Add local ip into excluded IP for external URL download.
...
Fix #yogosha5861
2021-04-19 13:52:12 +02:00
fr69400
e678091b12
Update contact.php
2021-04-19 13:09:53 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
stickler-ci
f71b15ac8e
Fixing style errors.
2021-04-19 10:05:56 +00:00
x
e78f6e3001
replace urlencode
2021-04-19 12:03:52 +02:00
x
b41d90aa51
merge conflict
2021-04-19 12:00:20 +02:00
x
8f1046fcb3
use form->selectDate instead of html input type date
2021-04-19 11:56:37 +02:00
stickler-ci
08787cf40f
Fixing style errors.
2021-04-19 09:52:17 +00:00
x
584c09d62c
shorten link to 509 lenght Stickler CI / stickler-ci
2021-04-19 11:50:03 +02:00
x
93c86d077a
merge confilct
2021-04-19 11:43:26 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
NextGestion
a4eb4aa802
Code optimisation.
2021-04-19 10:08:35 +01:00
JC Prieto
4329b6b99b
Update bonprelevement.class.php
...
Change facture reference by supplier reference
2021-04-19 11:04:50 +02:00
Laurent Destailleur
83b5a325df
Load of template before the loop.
2021-04-19 10:47:12 +02:00
Laurent Destailleur
ad84af1d0a
Fix id cron task
2021-04-19 10:39:16 +02:00
Laurent Destailleur
634c8c9fa4
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:38:52 +02:00
Laurent Destailleur
a74b237a7b
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:35:19 +02:00
Pierre Payet
a6c6f9eb08
add missing printFieldListFrom hook
2021-04-19 10:20:51 +02:00
Dorian Vabre
0325f02368
timestamp converted to get date of start and end on the invoice
2021-04-19 10:09:19 +02:00
Dorian Vabre
701b53773b
added description of the line in the invoice, problem with dates that are int
2021-04-19 09:54:29 +02:00
stickler-ci
318a783237
Fixing style errors.
2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab
FIX : test on link type
2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209
Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link
2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e
FIX : cast int
2021-04-19 09:15:47 +02:00
Alexandre SPANGARO
305b338a11
Update notified
2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
7c0350e948
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-19 06:02:26 +02:00
Laurent Destailleur
1988703a60
Bad test
2021-04-18 23:27:39 +02:00
Laurent Destailleur
a1acc896e2
Accept several sizes for favicon
2021-04-18 23:25:47 +02:00
Laurent Destailleur
97564bfcc9
css
2021-04-18 23:18:32 +02:00
Laurent Destailleur
efe6eab5f3
Save default langueg and other language in export of website
2021-04-18 23:09:23 +02:00
ATM john
d25c544a7a
Merge branch 'new/check_update_for_module' of github.com:atm-john/dolibarr into new/check_update_for_module
2021-04-18 22:50:43 +02:00
ATM john
b337422576
Remove ctrl+v
2021-04-18 22:50:34 +02:00
stickler-ci
8ab117a62f
Fixing style errors.
2021-04-18 20:40:34 +00:00
ATM john
781756913b
Fix code Stickler
2021-04-18 22:38:18 +02:00
stickler-ci
fff358f040
Fixing style errors.
2021-04-18 20:28:36 +00:00
ATM john
fb922d9a5a
remove space
2021-04-18 22:26:27 +02:00
ATM john
da11ac42ac
New check update for modules
2021-04-18 22:13:37 +02:00
Laurent Destailleur
7a37296832
css
2021-04-18 20:53:09 +02:00
Laurent Destailleur
a8a540a58d
Clean code
2021-04-18 20:34:14 +02:00
Laurent Destailleur
d42ccef92d
Position autoset
2021-04-18 20:33:37 +02:00
Laurent Destailleur
0c53198495
Easier to click
2021-04-18 20:18:38 +02:00
Laurent Destailleur
2b894e8ab3
css
2021-04-18 20:13:18 +02:00
ATM john
7794927a64
New check update for modules
2021-04-18 20:12:24 +02:00
Laurent Destailleur
55f114511c
Debug v14
2021-04-18 16:56:55 +02:00
Laurent Destailleur
c4f27cc29f
Debug module salary
2021-04-18 16:43:09 +02:00
Laurent Destailleur
f4fa16797b
Complete information on tab for files on salary
2021-04-18 16:00:48 +02:00
Laurent Destailleur
69aa5553f5
Fix syntax error
2021-04-18 15:28:52 +02:00
Laurent Destailleur
10f1443d4a
Debug sitemap generation. Bad format of date
2021-04-18 15:27:45 +02:00
Laurent Destailleur
cad7ea0b92
css
2021-04-18 15:07:22 +02:00
Laurent Destailleur
03f7ec13cf
Can sort on language on list of website pages
2021-04-18 15:00:23 +02:00
Laurent Destailleur
8067e1d70a
Fix order
2021-04-18 14:48:38 +02:00
Laurent Destailleur
fd3f2f4e27
Set order in sitemap
2021-04-18 14:46:14 +02:00
Laurent Destailleur
038b005e6a
Fix sql error
2021-04-18 14:44:33 +02:00
Laurent Destailleur
08deb3c0e9
Fix selection of files to report into sitemap
2021-04-18 14:41:05 +02:00
Laurent Destailleur
20fb70d493
Fix syntax error
2021-04-18 14:34:08 +02:00
Laurent Destailleur
ecadc03b75
Fix sitemaps for multilang
2021-04-18 14:32:17 +02:00
Laurent Destailleur
ae595d8545
Fix sitemap
2021-04-18 14:18:05 +02:00
Laurent Destailleur
54c90059ff
Fix sitemaps
2021-04-18 14:11:22 +02:00
Laurent Destailleur
3502c4c269
Debug sitemap generation
2021-04-18 13:45:46 +02:00
Laurent Destailleur
fbc28795bc
Debug sitemap generation
2021-04-18 12:51:37 +02:00
Alexandre SPANGARO
510f387a80
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-18 07:49:48 +02:00
daraelmin
17c2b4f0e8
Fix warning wrong date format for new member form
...
Fix warning wrong date format for new member form when new membre submit no birthdate
2021-04-17 23:58:00 +02:00
daraelmin
b96d3cebda
Update new.php
2021-04-17 14:51:05 +02:00
daraelmin
16dfde1128
Update new.php
2021-04-17 14:39:14 +02:00
NextGestion
345fef99b6
Merge branch 'dolibarr_partnership' of https://github.com/NextGestion/dolibarr into dolibarr_partnership
2021-04-17 13:38:58 +01:00
stickler-ci
48dffaaa53
Fixing style errors.
2021-04-17 13:30:56 +00:00
NextGestion
973ea370e8
Fixing errors
2021-04-17 13:38:23 +01:00
stickler-ci
d23e746609
Fixing style errors.
2021-04-17 12:29:23 +00:00
daraelmin
d6085fb68a
Update new.php
2021-04-17 14:29:02 +02:00
NextGestion
5a8742b3eb
Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website
2021-04-17 13:25:28 +01:00
stickler-ci
fcbea36605
Fixing style errors.
2021-04-17 12:21:40 +00:00
daraelmin
17f84c4edc
Fix new member form use getpost instead FORCEXXX
...
## Fix use FORCETYPE, FORCECOUNTRYCODE, FORCEMORPHY even if GETPOST bas value
## Fix code style : typeid is note type
## Fix reset amount when $amount is set by script or by hook
## Fix some code style
2021-04-17 14:18:42 +02:00
NextGestion
f7b1ee9aba
Add property "website" on the member card
2021-04-17 13:15:16 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership
2021-04-17 13:51:21 +01:00
Laurent Destailleur
4abf7d1c91
Better error management for SMTPS sending method
2021-04-17 13:53:52 +02:00
Alexandre SPANGARO
89d960f6dd
Field tva is deprecated
2021-04-17 08:13:59 +02:00
Alexandre SPANGARO
78dbf4f7ff
Split mod fournisseur
2021-04-17 07:49:19 +02:00
Laurent Destailleur
c929c05dc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-17 03:33:31 +02:00
Laurent Destailleur
01c21d2d10
Fix title of email to reset password
2021-04-17 03:32:05 +02:00
Laurent Destailleur
0d8a354934
Set default length of password to 12 car.
...
FIX #yogosha5855
2021-04-17 03:11:58 +02:00
andreubisquerra
83da58b85f
Fix travis
2021-04-17 01:17:48 +02:00
jove@bisquerra.com
712e1c4e7c
NEW Edit sales lines rights in TakePOS
2021-04-17 01:06:30 +02:00
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev
...
Fix compatibility phpv8
2021-04-16 20:51:00 +02:00
Laurent Destailleur
94005f17a5
Merge pull request #17274 from altairisfr/project_warehouse
...
Project warehouse
2021-04-16 20:45:49 +02:00
Laurent Destailleur
12e2055faa
Merge pull request #17259 from bb2a/mass_action_propal_right
...
Workflo mass action propal sign or NotSigned and notification #17143
2021-04-16 20:45:14 +02:00
Laurent Destailleur
1a3e9cae68
Comment
2021-04-16 20:44:30 +02:00
Laurent Destailleur
26428d6c61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-16 20:43:19 +02:00
Laurent Destailleur
4bc0c5b0b6
Fix cast
2021-04-16 20:43:04 +02:00
Laurent Destailleur
60990dc0e6
Merge pull request #17278 from OGPayet/fix/addMissingGroupByHookInFichinterList
...
fix add missing group by hook in fichinter list
2021-04-16 20:41:39 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions
...
Next picto mass actions
2021-04-16 20:40:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021
...
Update facture list.php
2021-04-16 20:39:23 +02:00
Laurent Destailleur
c841282a25
Merge pull request #17283 from Givriz/dev_2
...
Compatibility phpv8 #2
2021-04-16 20:37:31 +02:00
Laurent Destailleur
a31efd248f
Merge pull request #17280 from andreubisquerra/develop
...
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-16 20:29:58 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project
...
Warehouses in project
2021-04-16 20:29:21 +02:00
Laurent Destailleur
10668ddfcc
Merge pull request #17284 from fmarcet/develop
...
New: Make more efficient data loading on replenishment
2021-04-16 20:17:16 +02:00
Laurent Destailleur
b035e987a3
Merge pull request #17287 from fr69400/patch-3
...
Update contact.php
2021-04-16 20:15:46 +02:00
Laurent Destailleur
fbf7b21c29
Update contact.php
2021-04-16 20:15:00 +02:00
Laurent Destailleur
7ce8470788
Merge pull request #17288 from FHenry/fix_13_toomanytestmenu
...
fix: remove double test
2021-04-16 20:14:22 +02:00
Laurent Destailleur
015ee4e7b3
Merge pull request #17294 from dolibit-ut/patch-277
...
Update llx_10_c_regions.sql
2021-04-16 20:14:07 +02:00
Laurent Destailleur
af9c2384ef
Add warning
2021-04-16 19:14:01 +02:00
Laurent Destailleur
f061a3b8f7
css
2021-04-16 17:15:28 +02:00
Givriz
86bfcd9510
Easy way to use conf->global
2021-04-16 17:10:11 +02:00
UT from dolibit
b9f0bc454b
Update llx_20_c_departements.sql
...
Tunisia
2021-04-16 17:00:10 +02:00
stickler-ci
37f44f4a07
Fixing style errors.
2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b
FIX : type link extrafield case for advanced target emailing
2021-04-16 16:55:19 +02:00
UT from dolibit
4b0e846e25
Update llx_10_c_regions.sql
...
Tunesia
Luxembourg
Morocco
2021-04-16 16:50:08 +02:00
Robin
63d7698b43
ADD company option for disable Workforce
2021-04-16 15:26:29 +02:00
Dorian Vabre
e525311142
now using the invoice id as ref in url passed to newpayment page, for conference subscriptions
2021-04-16 14:54:07 +02:00
NextGestion
f784114176
Add email template for accepted partnership
2021-04-16 13:53:12 +01:00
stickler-ci
54c2f26c5c
Fixing style errors.
2021-04-16 12:47:39 +00:00
Oarces DEV
593e23220d
Update list.php
...
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
2021-04-16 14:34:23 +02:00
NextGestion
ae07e511f7
Fix Errors
2021-04-16 12:44:39 +01:00
stickler-ci
1324f3d375
Fixing style errors.
2021-04-16 12:13:05 +00:00
NextGestion
22ec79d03c
Code optimisation
2021-04-16 12:10:26 +01:00
Dorian Vabre
2d79133228
now using ht instead or ttc
2021-04-16 12:15:23 +02:00
Dorian Vabre
5a445d92de
vat ok
2021-04-16 12:10:02 +02:00
NextGestion
ba93ccaa01
Decline reason for partnership management
2021-04-16 10:56:01 +01:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership
2021-04-16 11:01:08 +01:00
stickler-ci
49ba11625a
Fixing style errors.
2021-04-16 09:58:16 +00:00
fr69400
bd5c03f1a0
Update contact.php
2021-04-16 11:02:17 +02:00
NextGestion
9304b3c474
Manage mass action "Send email" for Partnership module
2021-04-16 09:54:11 +01:00
Florian HENRY
99b7deba14
Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu
2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256
fix double test
2021-04-16 10:37:42 +02:00
fr69400
6ea94c6e0c
Update contact.php
2021-04-16 10:36:24 +02:00
fr69400
65b55a79a5
Update contact.php
...
action 'deletecontact' may have beeen cancelled by triggers. this is not system error
2021-04-16 10:31:18 +02:00
Laurent Destailleur
38f54d0582
FIX Missing extrafields into export of agenda record
2021-04-16 10:26:35 +02:00
Laurent Destailleur
8b2304ec8e
Better warning
2021-04-15 19:28:13 +02:00
Laurent Destailleur
ceb50d90ca
NEW Add a page about security setup advices
...
NEW Add a page about performance setup advices
2021-04-15 19:25:37 +02:00
Laurent Destailleur
8e2cc43eb1
Clean code
2021-04-15 19:19:58 +02:00
Laurent Destailleur
f2bd030f91
Clean code
2021-04-15 19:14:43 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
stickler-ci
f76d540451
Fixing style errors.
2021-04-15 15:49:42 +00:00
Ferran Marcet
512b54d049
New: Streamline data loading on replenishment
2021-04-15 17:44:35 +02:00
Dorian Vabre
71befd15f9
typo v2
2021-04-15 17:10:11 +02:00
Dorian Vabre
ed857481a2
typo
2021-04-15 17:09:26 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Dorian Vabre
db6ca73882
deletion of vardumps and correction in the invoice creation
2021-04-15 17:00:53 +02:00
Dorian Vabre
2cbe5b188e
wip invoice
2021-04-15 16:57:41 +02:00
Givriz
0a0804e7d5
Update dict.php
2021-04-15 16:36:17 +02:00
Laurent Destailleur
48a80dcef7
Fix: make crash on some apache setup when setting option not allowed.
2021-04-15 16:28:32 +02:00
Dorian Vabre
ae69cc93be
wip on payment page
2021-04-15 16:16:45 +02:00
Dorian Vabre
208478906c
add type product in modulebuilder
2021-04-15 16:10:01 +02:00
Laurent Destailleur
707efa7765
Debug v14
2021-04-15 15:54:54 +02:00
Laurent Destailleur
af39923a62
Debug v14
2021-04-15 15:41:21 +02:00
Laurent Destailleur
754b0e9853
Debug v14
2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19
Fix method not found
2021-04-15 15:07:06 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
Laurent Destailleur
ce1a257522
Fix remove a setup that should not exists. Info is already into a table
2021-04-15 13:53:24 +02:00
Laurent Destailleur
d4884e9063
Debug
2021-04-15 13:36:05 +02:00
Laurent Destailleur
7e4f7f7200
Nicer page of widget setup
2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9
Nicer page of widget setup
2021-04-15 13:22:03 +02:00
Dorian Vabre
12a796fd8e
dynamic selector print improved, now using ref instead of id
2021-04-15 12:57:19 +02:00
Laurent Destailleur
e1a33e6c55
css
2021-04-15 12:50:47 +02:00
Dorian Vabre
764d984ebf
fix on dynamic selector
2021-04-15 12:28:53 +02:00
NextGestion
010b89ce78
Merge branch 'dolibarr_partnership' of https://github.com/NextGestion/dolibarr into dolibarr_partnership
2021-04-15 11:22:46 +01:00
NextGestion
e8fc6fe293
Code optimization
2021-04-15 11:21:33 +01:00
Dorian Vabre
98c622446e
dynamic selector of service/product used for the invoice added
2021-04-15 12:14:34 +02:00
Laurent Destailleur
bd1aa38c64
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Dorian Vabre
880d763abe
wip on payment page
2021-04-15 11:55:28 +02:00
Dorian Vabre
dd7c09582f
payment page structure ok, still need to confirm the attendee after the payment
2021-04-15 10:45:44 +02:00
altairis-noe
2e340c61cc
preselect project when warehouse created from there
2021-04-15 10:31:18 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
Alexandre SPANGARO
1be8bfe5c0
Text
2021-04-15 06:08:41 +02:00
Laurent Destailleur
5e2bec9cad
Look and feel v14
2021-04-15 02:09:29 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-14 23:32:08 +02:00
Alexandre SPANGARO
b2a1b06736
text
2021-04-14 23:19:10 +02:00
Alexandre SPANGARO
957968eea2
typo
2021-04-14 23:17:26 +02:00
Alexandre SPANGARO
140f098c79
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-14 23:16:30 +02:00
Laurent Destailleur
e7d64d073a
Look and feel v14
2021-04-14 23:14:38 +02:00
Laurent Destailleur
d4420bbfd9
Look and feel v14
2021-04-14 22:31:44 +02:00
Givriz
47cdfee1d2
Compatibility pvpv8
2021-04-14 22:03:04 +02:00
Pierre Payet
377c730363
add missing group by hook in fichinter list
2021-04-14 21:27:53 +02:00
Laurent Destailleur
195d3b578b
Fix phpcs
2021-04-14 20:44:34 +02:00
Laurent Destailleur
59f1270264
Trans
2021-04-14 19:12:25 +02:00
Laurent Destailleur
8bfb69cdba
Fix security check
2021-04-14 18:56:31 +02:00
Gauthier PC portable 024
9ca67b81f8
FIX : correction migration queries for postgres
2021-04-14 18:49:21 +02:00
stickler-ci
5d404836f7
Fixing style errors.
2021-04-14 16:35:19 +00:00
Givriz
598156de04
Update modDataPolicy.class.php
...
There was useless condition
2021-04-14 17:58:46 +02:00
NextGestion
03a944edf5
Manage membership expiration
2021-04-14 16:32:23 +01:00
Alexandre SPANGARO
89281d4875
Merge remote-tracking branch 'upstream/develop' into 14a38
2021-04-14 16:43:16 +02:00
Dorian Vabre
caf74fe1cb
pull problem corrected
2021-04-14 16:20:05 +02:00
stickler-ci
4700fd467f
Fixing style errors.
2021-04-14 14:14:39 +00:00
Gauthier PC portable 024
4d643db4e6
FIX : travis
2021-04-14 16:14:03 +02:00
altairis-noe
658e1de45d
stickler adjust
2021-04-14 16:08:28 +02:00
Givriz
9b66895945
Update mails_templates.php
2021-04-14 16:06:53 +02:00
Dorian Vabre
c58414c0ca
merging with dev_EventOrganization after the changes on it
2021-04-14 16:04:36 +02:00
stickler-ci
6f0f527a89
Fixing style errors.
2021-04-14 14:04:33 +00:00
Gauthier PC portable 024
a596424328
FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid
2021-04-14 16:01:48 +02:00
Dorian Vabre
3d5e439d92
company name is now required if price is set
2021-04-14 15:55:59 +02:00
Dorian Vabre
2f3f2509b2
wip on asking for the company name only if price is set v2
2021-04-14 15:54:21 +02:00
Dorian Vabre
6238ff0321
wip on asking for the company name only if price is set
2021-04-14 15:52:46 +02:00
Givriz
32d401bed4
Update mails.php
2021-04-14 15:26:18 +02:00
Laurent Destailleur
63d4d83025
Better text
2021-04-14 15:15:52 +02:00
Laurent Destailleur
b298420ac5
Fix bad test
2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04
Look and feel v14
2021-04-14 15:11:26 +02:00
NextGestion
4e45011e45
Manage Partnership for third-party
2021-04-14 13:59:38 +01:00
NextGestion
a91a9256a3
Fix extrafields in list
2021-04-14 13:49:26 +01:00
Anthony Berton
a612831e28
next_change
2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2
removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice
2021-04-14 14:33:11 +02:00
altairis-noe
4c8d37ce28
warehouse can now be linked to a project with
...
fk_project
2021-04-14 13:45:25 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Laurent Destailleur
485095c5ed
Merge pull request #17264 from bb2a/mass_action_bill_picto_right
...
ADD Picto mass actions in lists
2021-04-14 12:10:23 +02:00
Laurent Destailleur
3a0ca6f3e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-14 12:03:49 +02:00
Laurent Destailleur
4c7547576b
Fix label
2021-04-14 12:02:56 +02:00
Laurent Destailleur
b22d8efc6c
Merge pull request #17267 from bb2a/bug_install_v14_societe_entrepot_warehouse
...
BUG New install v14 bug fk_warehouse not fk_entrepot in table
2021-04-14 12:01:52 +02:00
Laurent Destailleur
0520a6044b
Merge pull request #17262 from andreubisquerra/master
...
TakePOS notes improvements
2021-04-14 11:58:31 +02:00
Anthony Berton
7137b3ddcc
Update llx_societe.sql
2021-04-14 11:49:37 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
altairis-noe
7040330914
project select in edit or create warehouse
2021-04-14 10:13:31 +02:00
stickler-ci
bcab8d5164
Fixing style errors.
2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90
NEW : Add possibility to exports userGroups fields on user exports
2021-04-14 09:44:01 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product
2021-04-14 08:30:19 +02:00
stickler-ci
69fd2cf24c
Fixing style errors.
2021-04-14 02:50:23 +00:00
Alexandre SPANGARO
2f31720896
Maxi debug of societe/product per entity
2021-04-14 04:45:17 +02:00
stickler-ci
26767c1550
Fixing style errors.
2021-04-14 00:36:07 +00:00
Anthony Berton
3b2a27de16
Update list.php
2021-04-14 02:35:39 +02:00
Anthony Berton
5a68718eb2
Update list.php
2021-04-14 02:32:39 +02:00
stickler-ci
6324879215
Fixing style errors.
2021-04-14 00:25:05 +00:00
Anthony Berton
92ca59d20b
Update list.php
2021-04-14 02:23:23 +02:00
Anthony Berton
25ac8bed68
Update list.php
2021-04-14 01:54:30 +02:00
Anthony Berton
e1557b15ee
Update list.php
2021-04-14 01:12:20 +02:00
Anthony Berton
c7d0ff94f9
Update list.php
2021-04-14 01:03:32 +02:00
Anthony Berton
6814488d86
Update list.php
2021-04-14 00:51:19 +02:00
andreubisquerra
88f95b7f9b
Update index.php
2021-04-14 00:32:49 +02:00
Anthony Berton
992cf0a091
Update list.php
2021-04-14 00:29:06 +02:00
Anthony Berton
2c18e31ee0
Merge branch 'mass_action_propal_right' of https://github.com/bb2a/dolibarr into mass_action_propal_right
2021-04-14 00:28:07 +02:00
Anthony Berton
9e40b8bf4c
Update list.php
2021-04-14 00:27:46 +02:00
jove@bisquerra.com
db83428e89
Notes improvements
2021-04-14 00:15:02 +02:00
stickler-ci
78b08586e3
Fixing style errors.
2021-04-13 22:11:04 +00:00
Anthony Berton
29dd2e4b67
Update list.php
2021-04-14 00:07:29 +02:00
Anthony Berton
22d48c9cb6
Update list.php
2021-04-14 00:03:33 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks
...
Product masks
2021-04-13 23:06:09 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition
...
fix date closing option position
2021-04-13 23:03:02 +02:00
Laurent Destailleur
7e4dcde089
Merge pull request #17257 from ibuiv/patch-4
...
Fix Infinite Loop in trigger
2021-04-13 23:01:28 +02:00
Laurent Destailleur
7f62b6c49b
Look and feel v14
2021-04-13 22:58:37 +02:00
Laurent Destailleur
25a6aa1388
NEW Add data-eec=1 for EEC countries on select for js interaction
2021-04-13 22:50:50 +02:00
Laurent Destailleur
1c8a2ce15a
Fix phpcs
2021-04-13 22:12:47 +02:00
Laurent Destailleur
161baa672a
Fix phpcs
2021-04-13 21:11:02 +02:00
Laurent Destailleur
97292d6843
Fix phpcs
2021-04-13 20:28:25 +02:00
stickler-ci
0511d5848e
Fixing style errors.
2021-04-13 18:24:18 +00:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
ibuiv
2a391dc13f
Fix Loop in trigger with CommandeFournisseur::createFromClone
...
added param $notrigger to avoid an infinite loop when createFromClone calls create
2021-04-13 20:19:02 +02:00
Laurent Destailleur
fe57ba2116
Fix phpcs
2021-04-13 20:00:36 +02:00
Laurent Destailleur
f54fd1063b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a
Debug mass action after regression on close on proposal
2021-04-13 19:38:55 +02:00
Pierre Payet
75ed5e45f2
fix date closing option position
2021-04-13 17:21:51 +02:00
altairis-noe
2e297b5753
one more print
2021-04-13 17:02:58 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Givriz
bc78b87020
pvpv8 continuous integration
2021-04-13 16:32:19 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31
...
FIX Write right on document
2021-04-13 16:18:48 +02:00
Laurent Destailleur
d09be1f86f
Do not make new twice
2021-04-13 16:18:18 +02:00
altairis-noe
ee1693edf0
colspans and inconditional GETPOST
2021-04-13 16:13:57 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36
2021-04-13 16:05:57 +02:00
Laurent Destailleur
4edf710594
Merge pull request #17220 from dolibit-ut/patch-263
...
Update llx_10_c_regions.sql
2021-04-13 15:58:43 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse
2021-04-13 15:58:13 +02:00
Laurent Destailleur
8aeed353c7
Merge pull request #17232 from dolibit-ut/patch-270
...
Update eventorganizationindex.php
2021-04-13 15:56:24 +02:00
Laurent Destailleur
da400ee17e
Merge pull request #17235 from dolibit-ut/patch-273
...
Update myobject_agenda.php
2021-04-13 15:56:06 +02:00
Laurent Destailleur
946a93dcd9
Update myobject_agenda.php
2021-04-13 15:55:50 +02:00
Laurent Destailleur
f99d4897a0
Merge pull request #17230 from dolibit-ut/patch-268
...
Update mo_card.php
2021-04-13 15:53:54 +02:00
Laurent Destailleur
91b8ccafbb
Fix empty label
2021-04-13 15:53:05 +02:00
Laurent Destailleur
4ad14a1f65
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 15:51:47 +02:00
Laurent Destailleur
97336ad417
Fix label of empty value in select of warehouse
2021-04-13 15:51:34 +02:00
Laurent Destailleur
302dd3e43d
Merge pull request #17238 from dolibit-ut/patch-275
...
Update agenda.php
2021-04-13 15:41:35 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3
...
fix MAIN_ADD_PDF_BACKGROUND
2021-04-13 15:41:20 +02:00
Laurent Destailleur
6b542a89f6
Merge pull request #17245 from Robin-Yann/13-fix-project-visibility-field
...
FIX: project visibility field with two option
2021-04-13 15:40:04 +02:00
Laurent Destailleur
ee07796131
Update card.php
2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php
2021-04-13 15:38:51 +02:00
Laurent Destailleur
4bbe02c209
Merge pull request #17223 from atm-gauthier/fix_migration_script
...
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-13 15:37:42 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer
...
Dev event organizer: public registration page to a conference
2021-04-13 15:31:40 +02:00
Dorian Vabre
339596f134
ref add in redirection url to payment page
2021-04-13 15:30:28 +02:00
Anthony Berton
5fec4c346e
Update index.php
2021-04-13 15:28:16 +02:00
Laurent Destailleur
0efe49e461
Merge pull request #17249 from Robin-Yann/13-fix-missing_param_settings
...
FIX missing parameter in select for POP
2021-04-13 15:19:14 +02:00
Dorian Vabre
a3e75c587c
adding amount and source to redirection url to newpayment
2021-04-13 15:07:15 +02:00
Dorian Vabre
633a3d39c6
wip on adding taxes and price to invoice
2021-04-13 14:32:17 +02:00
Dorian Vabre
db8dfb219c
addition of the subscriptionok page when the subscription price is not set or 0
2021-04-13 14:10:20 +02:00
Anthony Berton
68e46515a4
Update index.php
2021-04-13 13:54:37 +02:00
Anthony Berton
1b2f78ca06
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into filter_warehouse
2021-04-13 13:07:58 +02:00
Anthony Berton
69d489c12b
Update list.php
2021-04-13 13:00:44 +02:00
Dorian Vabre
fa47106ed7
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-13 12:21:27 +02:00
Laurent Destailleur
15d8a4af73
Merge pull request #17227 from dolibit-ut/patch-265
...
Update member_emails.php
2021-04-13 12:12:05 +02:00
Laurent Destailleur
e62c234c84
Merge pull request #17231 from dolibit-ut/patch-269
...
Update recruitmentcandidature_agenda.php
2021-04-13 12:11:39 +02:00
Laurent Destailleur
facfb5d305
Merge pull request #17237 from dolibit-ut/patch-274
...
Update agenda.php
2021-04-13 12:10:52 +02:00
Laurent Destailleur
bcaf251c53
Merge pull request #17239 from dolibit-ut/patch-276
...
Create .htaccess
2021-04-13 12:10:27 +02:00
Dorian Vabre
0c6431efd5
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer
2021-04-13 12:10:15 +02:00
Dorian Vabre
3c265b2a5b
fixing style error
2021-04-13 12:09:53 +02:00
Laurent Destailleur
6b5091bb4a
Merge pull request #17244 from Robin-Yann/fix_13_addmissinghook
...
fix: add missing hook
2021-04-13 12:09:38 +02:00
Laurent Destailleur
8aecf24294
Merge pull request #17233 from dolibit-ut/patch-271
...
Update mo_agenda.php
2021-04-13 12:08:46 +02:00
Laurent Destailleur
bafdb00ea0
Update mo_agenda.php
2021-04-13 12:08:25 +02:00
Laurent Destailleur
91c55e1c91
Merge pull request #17229 from dolibit-ut/patch-267
...
Update bom_card.php
2021-04-13 12:07:47 +02:00
Laurent Destailleur
f177d91456
Merge pull request #17226 from dolibit-ut/patch-264
...
Update member_type_extrafields.php
2021-04-13 12:07:18 +02:00
stickler-ci
839edb5abe
Fixing style errors.
2021-04-13 10:06:42 +00:00
Laurent Destailleur
1be53379aa
Merge pull request #17228 from dolibit-ut/patch-266
...
Update bom_note.php
2021-04-13 12:06:41 +02:00
Laurent Destailleur
9e4f73306b
Merge pull request #17234 from dolibit-ut/patch-272
...
Delete index.html
2021-04-13 12:05:57 +02:00
Dorian Vabre
14e64f4a33
security changes: encryption is now with instead of hard coded keys
2021-04-13 11:57:36 +02:00
altairis-noe
14c93d14e4
whitespace correction
2021-04-13 11:39:12 +02:00
Laurent Destailleur
1bae707246
Prepare table for future enhancement
2021-04-13 11:38:37 +02:00
Dorian Vabre
149aa8e81b
email is now used as name, if name is empty
2021-04-13 11:31:22 +02:00
Laurent Destailleur
3439bc4a0f
Clean code
2021-04-13 11:30:23 +02:00
altairis-noe
a95911e096
stickler corrections
2021-04-13 11:21:41 +02:00
Robin
dbd56bc03e
FIX: mask selector fournisseur if module not activate
2021-04-13 11:00:28 +02:00
Anthony Berton
b2eaca75bf
Update list.php
2021-04-13 10:55:48 +02:00
Robin
0839ee25cd
FIX missing parameter in select for POP
...
All options can be modified for selector in pop
2021-04-13 10:44:14 +02:00
Anthony Berton
1b995226b7
add_filter_warehouse_propal
2021-04-13 10:43:36 +02:00
Dorian Vabre
0b4149cb91
removal of subscriptionok page, bad branch
2021-04-13 10:43:23 +02:00
Dorian Vabre
caeb357aab
security improvement by adding id to securekey before encryption
2021-04-13 10:40:33 +02:00
altairis-noe
eee40a1840
Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product
2021-04-13 10:36:37 +02:00
stickler-ci
6ab0de145b
Fixing style errors.
2021-04-13 08:33:57 +00:00
altairis-noe
f69ccbbab8
remove empty line
2021-04-13 10:31:24 +02:00
Laurent Destailleur
0d136d6806
Enhance barcode scanner tool
2021-04-13 10:24:57 +02:00
Robin
d6caa057f2
FIX: project visibility field with two option
...
If two option of disabled visibility are add on constant, combo is not display
2021-04-13 10:23:05 +02:00
Laurent Destailleur
9e491ad30c
Add comment
2021-04-13 10:18:23 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php
2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php
2021-04-13 09:53:51 +02:00
Laurent Destailleur
7004747ca3
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
Conflicts:
htdocs/accountancy/admin/account.php
2021-04-13 09:51:17 +02:00
Florian HENRY
cf1c4ce11f
add missing hook
2021-04-13 09:51:08 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php
2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9
Update pdf_azur.modules.php
2021-04-13 09:49:03 +02:00
Laurent Destailleur
2f77181781
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 09:47:18 +02:00
Frédéric FRANCE
fcca5d7d5c
Update pdf_sponge.modules.php
2021-04-13 09:47:15 +02:00
Laurent Destailleur
243fcb38ba
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
2021-04-13 09:46:50 +02:00
Frédéric FRANCE
9ce6d841cc
Update pdf_crabe.modules.php
2021-04-13 09:40:16 +02:00
Alexandre SPANGARO
f66ec58865
Fix travis error
2021-04-12 22:06:44 +02:00
Alexandre SPANGARO
bb74a8b1b5
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-12 22:01:46 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
UT from dolibit
6785cdd751
Create .htaccess
2021-04-12 19:48:42 +02:00
stickler-ci
6724fb7ba0
Fixing style errors.
2021-04-12 17:37:21 +00:00
UT from dolibit
bae363cf0c
Update agenda.php
...
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';
llxHeader('', $title, $help_url);
2021-04-12 19:35:14 +02:00
UT from dolibit
8e8db6a48f
Update agenda.php
...
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';
2021-04-12 19:32:34 +02:00
UT from dolibit
488e80e959
Update myobject_agenda.php
2021-04-12 19:28:32 +02:00
UT from dolibit
769f052618
Delete index.html
2021-04-12 19:25:19 +02:00
UT from dolibit
dc3574923e
Update mo_agenda.php
2021-04-12 19:24:25 +02:00
UT from dolibit
511848d8dc
Update eventorganizationindex.php
...
$title = $langs->trans('EventOrganizationArea');
llxHeader('', $title, '');
2021-04-12 19:09:52 +02:00
UT from dolibit
f173cabf39
Update recruitmentcandidature_agenda.php
...
$help_url = 'Module_Agenda_En';
2021-04-12 19:05:22 +02:00
UT from dolibit
38d87494c0
Update mo_card.php
...
$title = $langs->trans('Mo');
llxHeader('', $title, '');
2021-04-12 19:02:15 +02:00
UT from dolibit
3d18b0fbf7
Update bom_card.php
...
$title = $langs->trans('BOM');
2021-04-12 18:51:44 +02:00
UT from dolibit
fd870e9eaf
Update bom_note.php
2021-04-12 18:49:35 +02:00
stickler-ci
d7665b49c1
Fixing style errors.
2021-04-12 16:44:07 +00:00
UT from dolibit
e177bb059d
Update member_emails.php
2021-04-12 18:41:44 +02:00
UT from dolibit
a917382f6c
Update member_type_extrafields.php
...
$help_url => |DE:Modul_Mitglieder';
2021-04-12 18:29:07 +02:00
altairis-noe
0965f28bf7
a pinch of jquery to display only what we need when we need it
2021-04-12 17:56:57 +02:00
Dorian Vabre
7644174c4a
subscriptionok page addition
2021-04-12 17:29:44 +02:00
Laurent Destailleur
202243d8a3
Fix payment link for renewal with a unique secure key
2021-04-12 17:19:58 +02:00
Dorian Vabre
167da1445d
securekey added in
2021-04-12 17:16:24 +02:00
Dorian Vabre
358a2bf365
hardcoded label put in ->trans
2021-04-12 17:10:57 +02:00
Dorian Vabre
d9513da8de
email now required in the attendee_subscription page, company name no longer required. Check on existing third party now depends on the email. todo: what if the name is empty?
2021-04-12 17:05:09 +02:00
Dorian Vabre
e1fb368d3a
wip
2021-04-12 16:50:56 +02:00
Laurent Destailleur
a7a95cff03
Fix payment link for renewal with a unique secure key
2021-04-12 16:41:40 +02:00
Damien BENOIT
9abc7a5b0d
Update modDataPolicy.class.php
2021-04-12 16:16:48 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Givriz
7a54e5d346
Using empty instead of isset
...
I used empty instead of isset, and I fixed some problems of my previous pull request
2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Dorian Vabre
15d103e957
subs validation for free conferences added
2021-04-12 15:52:49 +02:00
Dorian Vabre
ebd5f29231
invoice OK except price, wip on the payment page
2021-04-12 15:44:25 +02:00
Laurent Destailleur
81487d76b2
Clean code of ol deprecated option
2021-04-12 15:37:26 +02:00
Gauthier PC portable 024
aff07ac13c
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-12 14:43:28 +02:00
altairis-noe
ab39cfdf09
oops, better if we test the right const
2021-04-12 14:32:05 +02:00
Laurent Destailleur
8fa943edc3
Fix select field in multiselect of languages
2021-04-12 14:26:09 +02:00
altairis-noe
beecc6f935
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807
checkboxes for custom masks
2021-04-12 14:01:36 +02:00
Laurent Destailleur
eb3438baa7
css
2021-04-12 13:02:34 +02:00
Laurent Destailleur
5dd0d05c4e
Test to disable text in menu
2021-04-12 12:07:11 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks
2021-04-12 11:42:23 +02:00
Laurent Destailleur
86328462c7
Enhance getURLContent
2021-04-12 11:20:44 +02:00
Laurent Destailleur
a68378da3f
Fix #yogosha5840
2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb
Look and feel v14
2021-04-12 10:19:38 +02:00
Dorian Vabre
fd476b6cb9
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-12 10:16:38 +02:00
Dorian Vabre
bb70908dac
modifications to match @eldy's expectations
2021-04-12 10:09:05 +02:00
Dorian Vabre
58abeb1e1e
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-12 10:02:04 +02:00
Alexandre SPANGARO
fb221a0541
Add right supplier_order
2021-04-12 09:59:03 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
1ef89b8e7a
Add right supplier_invoice
2021-04-12 08:59:25 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
80995c34b5
FIX Write right on document
2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
2a1a22763d
Work on split module fournisseur
2021-04-12 06:51:00 +02:00
Alexandre SPANGARO
f749111148
Work on split module fournisseur
2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ab35b6b4f2
Work on split module fournisseur
2021-04-12 06:21:25 +02:00
Alexandre SPANGARO
2d77b9bdf0
Work on split module fournisseur
2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
b3744bce24
Work on split module fournisseur
2021-04-12 06:04:08 +02:00
Alexandre SPANGARO
bbd774f987
Work on split module fournisseur
2021-04-12 05:50:57 +02:00
Alexandre SPANGARO
77d751b03e
Work on split module fournisseur
2021-04-12 05:41:37 +02:00
Alexandre SPANGARO
c2f7e15add
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 05:31:12 +02:00
Laurent Destailleur
f6251679a1
Fix label
2021-04-11 22:41:53 +02:00
Laurent Destailleur
062f451b20
css
2021-04-11 22:40:07 +02:00
Laurent Destailleur
990da5574d
Fix trans
2021-04-11 22:35:20 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Laurent Destailleur
35d37c75fc
Fix EN Translation
2021-04-11 22:25:22 +02:00
Laurent Destailleur
04081954b1
Fix translation
2021-04-11 22:19:15 +02:00
Laurent Destailleur
3893c69dc1
Enhance perf and security page
2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
ab5599a672
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-11 20:53:30 +02:00
Laurent Destailleur
70383cca73
Add protection to avoid to overwrite a page with another similar name
2021-04-11 18:49:17 +02:00
UT from dolibit
8faaebb05f
Update llx_10_c_regions.sql
...
add new: Denmark
2021-04-11 18:10:33 +02:00
Laurent Destailleur
6f6c9058c1
CSS for dark theme
2021-04-11 17:08:48 +02:00
Laurent Destailleur
91fc78ac9c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
...
Conflicts:
htdocs/comm/action/index.php
2021-04-11 16:18:16 +02:00
Laurent Destailleur
f437e70ac6
Selection of theme is easier
2021-04-11 16:11:05 +02:00
Laurent Destailleur
cf51ccb479
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-11 16:03:07 +02:00
Laurent Destailleur
053be7a63c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
2021-04-11 16:02:52 +02:00
Laurent Destailleur
5eda49632a
Add more accurate information on login and last login date
2021-04-11 15:57:58 +02:00
Laurent Destailleur
c0b8aac12d
Merge pull request #17218 from dolibit-ut/patch-262
...
Update llx_10_c_regions.sql
2021-04-11 14:34:18 +02:00
Laurent Destailleur
6156a5690a
Merge pull request #17217 from dolibit-ut/patch-261
...
Update llx_20_c_departements.sql
2021-04-11 14:34:08 +02:00
Laurent Destailleur
46031dc39e
Fix missing column
2021-04-11 13:53:36 +02:00
Laurent Destailleur
fa231d85c9
Fix sql
2021-04-11 13:48:49 +02:00
Laurent Destailleur
0ab31a8680
Look and feel v14
2021-04-11 13:30:30 +02:00
UT from dolibit
ec9efd8018
Update llx_10_c_regions.sql
...
USA
Honduras
India
Indonesia
Panama
Mexique
Romania
2021-04-11 12:49:08 +02:00
UT from dolibit
051b3cf9ad
Update llx_20_c_departements.sql
...
Hungary - new sorting
2021-04-11 12:37:23 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Alexandre SPANGARO
451164ba64
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-10 21:44:23 +02:00
Laurent Destailleur
ac64938266
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 15:31:39 +02:00
Laurent Destailleur
8526ca5304
Merge pull request #17121 from 0x00FE/add-friday-holiday
...
NEW Add support for Friday as a holiday
2021-04-10 15:30:57 +02:00
Laurent Destailleur
421a515f75
Merge pull request #17214 from dolibit-ut/patch-260
...
Update llx_20_c_departements.sql
2021-04-10 15:29:05 +02:00
Laurent Destailleur
09e840a355
Merge pull request #17212 from dolibit-ut/patch-259
...
Update llx_10_c_regions.sql
2021-04-10 15:28:55 +02:00
Laurent Destailleur
be800e07f2
Use urlencode even on security key
2021-04-10 15:27:44 +02:00
Laurent Destailleur
0bc93d437e
css
2021-04-10 14:21:03 +02:00
Laurent Destailleur
35a64e08bf
Fix link
2021-04-10 14:12:51 +02:00
Laurent Destailleur
5be6ed3996
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/activity/perweek.php
2021-04-10 14:02:12 +02:00
Laurent Destailleur
cb57546d99
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:53:23 +02:00
UT from dolibit
cb08151473
Update llx_20_c_departements.sql
...
Romania
2021-04-10 13:47:35 +02:00
Laurent Destailleur
95a5296d45
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:29:24 +02:00
UT from dolibit
260f39a4d2
Update llx_10_c_regions.sql
...
Switzerland/Suisse
San Salvador
Netherlands
United Kingdom
2021-04-10 13:18:57 +02:00
Laurent Destailleur
1444920f57
Merge pull request #17204 from Hystepik/develop#1
...
Close #17193 : Move button added with PR 17161
2021-04-10 13:02:21 +02:00
Laurent Destailleur
5dfebcf351
Merge pull request #17203 from dolibit-ut/patch-256
...
Update llx_20_c_departements.sql
2021-04-10 12:58:31 +02:00
Laurent Destailleur
6241ba559b
Trans
2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5
Close #17206 Add comment on type of constants
2021-04-10 12:42:43 +02:00
Laurent Destailleur
4e6436c1bb
Merge pull request #17202 from dolibit-ut/patch-255
...
Update llx_10_c_regions.sql
2021-04-10 12:34:51 +02:00
Laurent Destailleur
19b223c484
Merge pull request #17209 from dolibit-ut/patch-258
...
Update llx_c_type_contact.sql
2021-04-10 12:34:37 +02:00
Laurent Destailleur
c86b100477
Update llx_c_type_contact.sql
2021-04-10 12:34:30 +02:00
Laurent Destailleur
af16c9c1e8
Merge pull request #17207 from dolibit-ut/patch-257
...
Update llx_c_socialnetworks.sql
2021-04-10 12:34:01 +02:00
Laurent Destailleur
b6e4bdbc6c
Merge pull request #17210 from Csardelacal/dev/goodfriday
...
Good friday is a holiday
2021-04-10 12:33:26 +02:00
Laurent Destailleur
1b88f05f28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:06:21 +02:00
Laurent Destailleur
3895142772
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2021-04-10 12:06:11 +02:00
NextGestion
2035b956a6
Fix Sql & translate files
2021-04-10 10:57:23 +01:00
César de la Cal Bretschneider
eadd8defaf
Good friday is a holiday
2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f
Fix phpcs
2021-04-10 00:31:20 +02:00
Laurent Destailleur
280d534b7a
Fix phpcs
2021-04-10 00:29:32 +02:00
Laurent Destailleur
0cf659eb85
Fix syntax error
2021-04-10 00:26:28 +02:00
UT from dolibit
0c343f1f0f
Update llx_c_type_contact.sql
2021-04-09 21:18:42 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
UT from dolibit
d269e8da15
Update llx_c_socialnetworks.sql
2021-04-09 20:55:28 +02:00
Ahmad Hadeed
63f7369adb
Fixing 'stickler-ci' complaint, function description not in order
2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed
fixing function description comment to satisfy 'stickler-ci'
2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1
Moving Friday to end of function declaration to maintain backward compatibility
2021-04-09 20:49:39 +03:00
Dorian Vabre
eef5b9514d
wip
2021-04-09 16:55:54 +02:00
NextGestion
85bef29b3d
Fix declaration of property
2021-04-09 15:43:19 +01:00
stickler-ci
2b58bc904b
Fixing style errors.
2021-04-09 14:36:02 +00:00
Dorian Vabre
a58e0ac8ac
nouveau fichier : public/eventorganization/attendee_subscription.php
2021-04-09 16:25:40 +02:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35
new: add attendees public registration page
2021-04-09 16:20:12 +02:00
Dorian Vabre
a590f945e9
thirdparty creation OK, wip on conforboothattendee creation
2021-04-09 16:12:25 +02:00
lmarcouiller
19ee78e123
Close #17193 : Move button convert in webp
2021-04-09 15:44:47 +02:00
UT from dolibit
cf83963e5f
Update llx_20_c_departements.sql
...
Netherlands/Nederland
2021-04-09 15:07:32 +02:00
UT from dolibit
4d243ae072
Update llx_10_c_regions.sql
...
Italy
Spain
2021-04-09 14:56:52 +02:00
Laurent Destailleur
42ddb6e5f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
7f91713c4a
Fix merge not complete
2021-04-09 14:06:30 +02:00
Laurent Destailleur
4b1974080a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146
...
13.0-fix17146
2021-04-09 13:57:50 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging
...
FIX: supplier order: error 500 when using packaging with product where it is not defined
2021-04-09 13:51:16 +02:00
altairis-noe
000342c2d8
custom masks : create, edit and display
2021-04-09 13:40:37 +02:00
Laurent Destailleur
4016c300d2
Fix missing lin to thirdparty on some actions
2021-04-09 13:38:29 +02:00
Laurent Destailleur
fe7654c067
Complete doc
2021-04-09 13:34:19 +02:00
Laurent Destailleur
4025488e08
css
2021-04-09 13:19:57 +02:00
Laurent Destailleur
a50b0e7441
Debug inventory module
2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1
...
Close #17145 : add link to autofill with expected qty
2021-04-09 12:50:33 +02:00
Laurent Destailleur
592800555f
Merge pull request #17148 from indelog/fix_empty_website_otherlang
...
Fix empty string WEBSITE_OTHERLANG (better fix)
2021-04-09 12:49:01 +02:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php
2021-04-09 12:48:06 +02:00
Laurent Destailleur
f7bab13c3c
Merge pull request #17187 from glu000/13.0-fix17186
...
FIX email is not case sensitive
2021-04-09 12:36:49 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype
...
NEW option to select membership type on the online payment page for membership subscription or renewal
2021-04-09 12:35:04 +02:00
Laurent Destailleur
17b446e8f7
Update adherent.class.php
2021-04-09 12:27:10 +02:00
Laurent Destailleur
445309bef2
Clean code
2021-04-09 12:25:45 +02:00
Laurent Destailleur
725c6be7db
CSS
2021-04-09 12:13:02 +02:00
Laurent Destailleur
e34335974c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-09 12:09:07 +02:00
Laurent Destailleur
afca96a8ee
Enhance barcode scanner tool
2021-04-09 12:08:56 +02:00
Laurent Destailleur
bbb75bd3c3
Merge pull request #17195 from FHenry/fix_dev_right_def_id
...
fix: right definition id in modulebuilder
2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1
Update modMyModule.class.php
2021-04-09 11:50:34 +02:00
Laurent Destailleur
0864daf2ad
Merge pull request #17189 from altairisfr/wh_project
...
add fk_project to warehouse table
2021-04-09 11:49:08 +02:00
Laurent Destailleur
45f9885978
Merge pull request #17196 from DorianVabre/new_add_config_type_securekey_module_builder
...
NEW: add config type securekey module builder
2021-04-09 11:47:29 +02:00
Laurent Destailleur
c0dc784061
Update eventorganization.php
2021-04-09 11:46:50 +02:00
Laurent Destailleur
e028195769
Merge pull request #17199 from Hystepik/develop#3
...
Fix error on module builder delete of a property
2021-04-09 11:42:23 +02:00
Laurent Destailleur
8a0ef6e17a
Update index.php
2021-04-09 11:41:29 +02:00
Laurent Destailleur
b3c382c02d
Update index.php
2021-04-09 11:38:23 +02:00
Laurent Destailleur
6609ef4941
Update index.php
2021-04-09 11:37:32 +02:00
Gauthier PC portable 024
c35c15e782
FIX : test must be === and not ==
2021-04-09 11:31:50 +02:00
lmarcouiller
fdb5b3b3da
Fix error on module builder delete of a property
2021-04-09 11:28:40 +02:00
lmarcouiller
b582396afc
edit objects in module builder with changes
2021-04-09 11:20:26 +02:00
Dorian Vabre
056143450b
NEW: add config type securekey module builder
2021-04-09 10:58:33 +02:00
lmarcouiller
3153966b24
New edit object in module builder
2021-04-09 09:19:52 +02:00
Florian HENRY
5555807104
fix: right definition id in modulebuilder
2021-04-09 08:51:09 +02:00
daraelmin
555a968f93
Fix html style error
2021-04-09 02:54:11 +02:00
daraelmin
071b50debf
Copyright
2021-04-09 02:51:05 +02:00
daraelmin
9ee80be23f
fix code style errors
2021-04-09 02:40:21 +02:00
stickler-ci
dce5c6be8f
Fixing style errors.
2021-04-09 00:28:07 +00:00
daraelmin
f2a49ef72f
New option amount by member type
2021-04-09 02:23:22 +02:00
Laurent Destailleur
475bdc24f4
Fix sql error
2021-04-09 01:31:55 +02:00
Laurent Destailleur
2d771704d0
Better suggestion for data after clone of social contribution
2021-04-09 00:36:08 +02:00
Laurent Destailleur
60711f415d
Fix permission on external user
2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
Laurent Destailleur
6c84b858ee
Fix #yogosha5832
2021-04-08 18:51:42 +02:00
NextGestion
d51001af31
Declare visibility for method "__construct
2021-04-08 17:42:59 +01:00
Laurent Destailleur
76c3229c97
Update to phpspreadsheet 1.8.2
2021-04-08 18:32:02 +02:00
altairis-noe
7c0d3d4d14
create custom masks in product cards
2021-04-08 18:03:46 +02:00
Laurent Destailleur
04536f9ec8
Fix import
2021-04-08 17:49:13 +02:00
Laurent Destailleur
d098bf412d
Move directory to match the one of composer package for phpspreadsheet
2021-04-08 17:35:52 +02:00
Dorian Vabre
60341e8a14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-08 17:29:16 +02:00
Dorian Vabre
6f51c69588
securekey ok
2021-04-08 17:15:49 +02:00
Christophe Battarel
4f413ca983
add fk_project to warehouse table
2021-04-08 16:46:52 +02:00
Dorian Vabre
af5b623b59
securekey added
2021-04-08 16:32:50 +02:00
Laurent Destailleur
c4a4d238f7
Merge pull request #17151 from OGPayet/fix/fournPayment
...
fix paiementfourn ref is now different from id
2021-04-08 16:26:34 +02:00
lmarcouiller
482b4e808b
chnages with eldy's advices
2021-04-08 16:21:50 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001
...
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-08 15:50:00 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4
2021-04-08 15:42:07 +02:00
Laurent Destailleur
b37cf2eb1c
Merge pull request #17157 from DorianVabre/fix_member_public_page
...
fix: new member public page firstname test
2021-04-08 15:40:24 +02:00
Laurent Destailleur
385053f107
Merge pull request #17158 from dolibit-ut/patch-239
...
Update llx_20_c_departements.sql
2021-04-08 15:34:48 +02:00
UT from dolibit
f609d03acc
Update llx_20_c_departements.sql
...
Chile
2021-04-08 15:24:59 +02:00
altairis-noe
b7280f6524
product masks are relevant only if we are in advanced mode
2021-04-08 15:15:58 +02:00
UT from dolibit
539c29b05f
Update llx_10_c_regions.sql
...
Chile
2021-04-08 14:38:43 +02:00
Laurent Destailleur
f8b5bee9eb
Add function getListOfPossibleImageExt
2021-04-08 14:20:59 +02:00
stickler-ci
0b1e3ce7e4
Fixing style errors.
2021-04-08 12:15:35 +00:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3
...
Close #17108 : New button to convert images in webp format
2021-04-08 14:06:45 +02:00
Laurent Destailleur
80582a4d7e
Merge pull request #17160 from dolibit-ut/patch-240
...
Update llx_10_c_regions.sql
2021-04-08 14:02:34 +02:00
Günter Lukas
11700f2162
Fix Ticket-Module public interface: uppercase/lowercaser in e-mail should be ignored #17186
2021-04-08 13:52:29 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7
...
Add bill tax code article for non profit organization VAT (fixes #17163 )
2021-04-08 13:46:22 +02:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004
...
NEW : Add new permok for edit extrafields on contact card
2021-04-08 13:43:39 +02:00
Laurent Destailleur
a39d45e111
Merge pull request #17170 from dolibit-ut/patch-243
...
Create index.html
2021-04-08 13:32:42 +02:00
Laurent Destailleur
602d6e0265
Merge pull request #17169 from dolibit-ut/patch-242
...
Create index.html
2021-04-08 13:32:30 +02:00
Laurent Destailleur
65e1d70232
Merge pull request #17172 from dolibit-ut/patch-245
...
Create index.html
2021-04-08 13:32:18 +02:00
Laurent Destailleur
cbf3c1c62e
Merge pull request #17173 from dolibit-ut/patch-246
...
Create index.html
2021-04-08 13:32:04 +02:00
Laurent Destailleur
4ef425da69
Merge pull request #17175 from dolibit-ut/patch-248
...
Create index.html
2021-04-08 13:29:59 +02:00
Laurent Destailleur
5ffcc9f5f4
Merge pull request #17174 from dolibit-ut/patch-247
...
Create index.html
2021-04-08 13:18:34 +02:00
Laurent Destailleur
30355d05c9
Merge pull request #17176 from dolibit-ut/patch-249
...
Create index.html
2021-04-08 13:18:26 +02:00
Laurent Destailleur
d395c21152
Merge pull request #17177 from dolibit-ut/patch-250
...
Create index.html
2021-04-08 13:18:14 +02:00
Laurent Destailleur
3fac86eaa5
Merge pull request #17178 from dolibit-ut/patch-251
...
Create index.html
2021-04-08 13:17:57 +02:00
Laurent Destailleur
70ce5f38a3
Merge pull request #17180 from dolibit-ut/patch-253
...
Create index.html
2021-04-08 13:16:36 +02:00
Laurent Destailleur
10f4b29111
Merge pull request #17168 from dolibit-ut/patch-241
...
Create index.html
2021-04-08 13:15:08 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005
...
FIX : Fix warning
2021-04-08 13:14:53 +02:00
Dorian Vabre
2f005db4a5
basic encryption of id in url + wip on creating a thirdparty
2021-04-08 11:06:34 +02:00
kamel
1ec6317b80
FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors)
2021-04-08 10:33:27 +02:00
Laurent Destailleur
aef164a7ee
Fix bad permission
2021-04-08 02:05:36 +02:00
Laurent Destailleur
3f119c8004
Fix eol
2021-04-08 01:43:38 +02:00
Laurent Destailleur
489cff46a3
FIX #yogosha5828
2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2
Fix #yogosha4510
2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d
Use all param of getURLContent
2021-04-07 23:31:16 +02:00
UT from dolibit
baf8c47ceb
Create index.html
2021-04-07 20:48:49 +02:00
UT from dolibit
2f349146ed
Create index.html
2021-04-07 19:44:39 +02:00
UT from dolibit
6d8bbaeeae
Create index.html
2021-04-07 19:42:47 +02:00
UT from dolibit
c9c7a55748
Create index.html
2021-04-07 19:42:11 +02:00
UT from dolibit
c910fb7594
Create index.html
2021-04-07 19:40:46 +02:00
UT from dolibit
6fce28e7d0
Create index.html
2021-04-07 19:39:29 +02:00
Laurent Destailleur
1e1b963ca7
Restriction on name of files
2021-04-07 19:38:54 +02:00
Damien BENOIT
ac2cca51c0
Update delais.php
2021-04-07 19:37:17 +02:00
UT from dolibit
a144ae147f
Create index.html
2021-04-07 19:36:13 +02:00
UT from dolibit
2fd18ca836
Create index.html
2021-04-07 19:12:04 +02:00
UT from dolibit
2d6bbf1e87
Create index.html
2021-04-07 19:10:13 +02:00
UT from dolibit
49a6654b58
Create index.html
2021-04-07 19:09:16 +02:00
UT from dolibit
2d6eb2809c
Create index.html
2021-04-07 19:08:41 +02:00
Laurent Destailleur
87d4e6e2c5
Add option API_DISABLE_LOGIN_API
2021-04-07 19:07:22 +02:00
kamel
c06cc6d75a
NEW : Add new permok for edit extrafields on contact card
2021-04-07 17:28:13 +02:00
Dorian Vabre
c6d3510e30
form ok, todo : creation of an attendee
2021-04-07 17:16:26 +02:00
altairis-noe
c5a0bc1f52
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-07 16:47:47 +02:00
altairis-noe
14e5e63612
one space too much
2021-04-07 16:44:51 +02:00
Christophe Battarel
05efc85008
Merge pull request #2 from altairis-noe/product_masks
...
Product masks
2021-04-07 16:20:39 +02:00
altairis-noe
4ffc6531fe
masks options are boolean
2021-04-07 16:09:27 +02:00
Florent Peyraud
7be9a98ef0
Add bill tax code article for non profit organization VAT
2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837
Fixing style errors.
2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3
Add menu entries into thirdparty menu or member menu & Allow extrafields
2021-04-07 12:21:59 +01:00
UT from dolibit
efb88936fd
Update llx_10_c_regions.sql
...
Greece
2021-04-07 12:49:52 +02:00
lmarcouiller
843882c7c7
update stock.lang
2021-04-07 12:46:51 +02:00
lmarcouiller
41db9abff8
Close #17145 : add link to autofill with expected qty
2021-04-07 12:46:28 +02:00
Laurent Destailleur
f4d56c710b
Fix log levels
2021-04-07 12:43:28 +02:00
UT from dolibit
9997ac59c7
Update llx_20_c_departements.sql
...
Honduras Departamentos
2021-04-07 12:38:49 +02:00
Dorian Vabre
999be03f8d
fix: new member public page firstname test
2021-04-07 12:36:30 +02:00
Dorian Vabre
07e018dc7d
work in progress
2021-04-07 12:30:08 +02:00
Laurent Destailleur
bf6ea78211
Better log
2021-04-07 12:22:30 +02:00
Laurent Destailleur
6dc10bc87d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-04-07 12:19:39 +02:00
Laurent Destailleur
18154d6d21
Standardize log
2021-04-07 12:18:53 +02:00
lmarcouiller
0611db68cf
add of tooltip
2021-04-07 11:21:41 +02:00
lmarcouiller
49b3970700
Close #17113 : Can upload a favicon in website module
2021-04-07 11:13:14 +02:00
Pierre Payet
d209dbe43e
add missing hooks in fourn invoice list
2021-04-07 11:01:51 +02:00
Marc de Lima Lucio
7df09b6e9e
FIX: esupplier order: error 500 when using packaging with product where it is not defined
2021-04-07 10:41:36 +02:00
altairis-noe
fc76e06058
Better tooltip, better name, translation
2021-04-07 10:25:30 +02:00
Pierre Payet
113db33a24
fix paiementfourn ref is now different from id
2021-04-07 10:24:02 +02:00
Dorian Vabre
f7b6e239e9
nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable)
2021-04-07 10:06:38 +02:00
Indelog
426e846f58
Fix website create/update empty otherlang
...
Empty otherlang value was not correctly ignored.
2021-04-07 10:01:05 +02:00
kamel
fcc27e9177
Corrections
2021-04-07 09:49:20 +02:00
Indelog
17fa9559a3
Fix empty string WEBSITE_OTHERLANG
...
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
Günter Lukas
04a55a3df3
Fix #17146
2021-04-07 09:08:34 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Laurent Destailleur
558d595798
Debug inventory module
2021-04-07 02:46:41 +02:00
Laurent Destailleur
7cfcb7472d
css
2021-04-07 02:31:13 +02:00
Laurent Destailleur
4ccb27ad40
Work on inventory module
2021-04-07 02:24:15 +02:00
Laurent Destailleur
20fbfc5b15
Merge pull request #17144 from indelog/fix_website_savepagealias_empty_otherlang
...
Fix empty $sublang dolSavePageAlias
2021-04-07 01:40:11 +02:00
Laurent Destailleur
0219a18a5c
trans
2021-04-07 01:27:56 +02:00
Laurent Destailleur
2816677d94
Fix css
2021-04-07 01:09:23 +02:00
Laurent Destailleur
bb9ba68c2b
Fix token expired
2021-04-07 00:52:38 +02:00
Laurent Destailleur
2e862f815a
Fix field total_ht
2021-04-07 00:44:01 +02:00
Laurent Destailleur
6609695a8d
index.html not required, there is already index.php
2021-04-07 00:30:28 +02:00
Laurent Destailleur
e23ddb383e
css
2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121
Fix css
2021-04-06 23:35:30 +02:00
Laurent Destailleur
1f76a99ee4
Fix status in popup
2021-04-06 23:07:47 +02:00
Indelog
4d60fe8ff9
Fix empty $sublang dolSavePageAlias
...
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
90b122035f
Fix css
2021-04-06 20:28:00 +02:00
Laurent Destailleur
5c0f0834dc
css
2021-04-06 20:23:44 +02:00
Laurent Destailleur
98e567a8f7
Fix css
2021-04-06 20:21:54 +02:00
Laurent Destailleur
7ff74768eb
Fix pb with renaming field total
2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100
Fix sql
2021-04-06 20:10:29 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
NextGestion
78b4aa61fa
Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup)
2021-04-06 18:57:45 +01:00
Laurent Destailleur
baf3cbdd6f
Merge pull request #17096 from Hystepik/develo#2
...
Close #17073 : Add of select line for mass deletion of chart of account lines
2021-04-06 19:46:46 +02:00
Laurent Destailleur
ab2231c9cf
Update account.php
2021-04-06 19:44:31 +02:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
...
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
435b47631d
Merge pull request #17126 from dolibit-ut/patch-229
...
Update llx_20_c_departements.sql
2021-04-06 19:32:36 +02:00
Laurent Destailleur
e993d4e244
Merge pull request #17127 from dolibit-ut/patch-230
...
Create index.html
2021-04-06 19:32:24 +02:00
Laurent Destailleur
a0d7d1d5f0
Merge pull request #17125 from dolibit-ut/patch-228
...
Update llx_10_c_regions.sql
2021-04-06 19:31:59 +02:00
Laurent Destailleur
bbbf1dc7c8
Merge pull request #17133 from dolibit-ut/patch-235
...
Update box.php
2021-04-06 19:31:45 +02:00
Laurent Destailleur
fedf29097b
Merge pull request #17138 from dolibit-ut/patch-237
...
Update productMargins.php
2021-04-06 19:31:25 +02:00
Laurent Destailleur
7c4c2deab3
Merge pull request #17128 from dolibit-ut/patch-231
...
Create index.html
2021-04-06 19:29:01 +02:00
Laurent Destailleur
a774a02452
Merge pull request #17129 from dolibit-ut/patch-232
...
Create index.html
2021-04-06 19:28:27 +02:00
Laurent Destailleur
60f6908d83
Merge pull request #17130 from dolibit-ut/patch-233
...
Create index.html
2021-04-06 19:28:12 +02:00
Laurent Destailleur
d64a3a4eb5
Merge pull request #17131 from dolibit-ut/patch-234
...
Create index.html
2021-04-06 19:27:59 +02:00
Laurent Destailleur
2a51dadc72
Merge pull request #17135 from frederic34/patch-3
...
doxygen
2021-04-06 19:27:42 +02:00
Laurent Destailleur
f08b0be9f1
Merge pull request #17140 from atm-gauthier/develop_fix_cant_update_task_if_closed_project
...
FIX : we can't update task if closed project because of wrong test wi…
2021-04-06 19:27:12 +02:00
Laurent Destailleur
58b963901e
Merge pull request #17111 from aspangaro/14a32
...
Accountancy - Add a constant to enable fk_docdet register
2021-04-06 19:02:39 +02:00
Laurent Destailleur
adbe832826
Update bookkeeping.class.php
2021-04-06 19:02:17 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
altairis-noe
4015e1607f
add masks to product_lot
2021-04-06 17:36:51 +02:00
stickler-ci
f5aa199c94
Fixing style errors.
2021-04-06 15:03:07 +00:00
Gauthier PC portable 024
04cb8453f0
FIX : we can't update task if closed project because of wrong test with PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE conf
2021-04-06 16:59:00 +02:00
stickler-ci
e4022e25e9
Fixing style errors.
2021-04-06 14:56:23 +00:00
NextGestion
debef2fb6d
initial Batch to cancel partnership for expired members
2021-04-06 15:53:51 +01:00
kamel
c44522594a
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-06 16:04:30 +02:00
Laurent Destailleur
a16f70ca09
Enhance sample code
2021-04-06 14:59:03 +02:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
UT from dolibit
8bb0d57645
Update productMargins.php
...
$helpurl => $help_url
2021-04-06 13:12:29 +02:00
Laurent Destailleur
767aa605a2
Enhance security page
2021-04-06 13:09:00 +02:00
lmarcouiller
c04387ff3b
Close #17108 : New button to convert images in webp format
2021-04-06 11:52:04 +02:00
stickler-ci
1419b75f22
Fixing style errors.
2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
241b0d3f63
Merge remote-tracking branch 'upstream/develop' into 14a32
2021-04-06 10:13:13 +02:00
lmarcouiller
3f70904398
changes to match eldy advices
2021-04-06 09:42:05 +02:00
stickler-ci
30d26c1e28
Fixing style errors.
2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Frédéric FRANCE
d44bf8be14
doxygen
2021-04-05 22:54:13 +02:00
Ahmad Hadeed
f2f2aed6cd
Fix 3 weekend holiday behavior after adding support to Friday as a holiday.
2021-04-05 22:05:22 +03:00
UT from dolibit
40059f1d05
Update box.php
...
$userid defined twice
2021-04-05 20:37:58 +02:00
UT from dolibit
904dca335a
Create index.html
2021-04-05 20:24:06 +02:00
UT from dolibit
74cbf34d61
Create index.html
2021-04-05 20:22:41 +02:00
UT from dolibit
c35621a2e7
Create index.html
2021-04-05 20:20:10 +02:00
UT from dolibit
888dfdba4a
Create index.html
2021-04-05 20:19:23 +02:00
UT from dolibit
cd556d3dfc
Create index.html
2021-04-05 20:17:45 +02:00
UT from dolibit
5c01b126a4
Update llx_20_c_departements.sql
...
Luxembourg
2021-04-05 20:01:05 +02:00
UT from dolibit
52ef2fefd4
Update llx_10_c_regions.sql
...
France
Germany
2021-04-05 19:47:12 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
NextGestion
6da2c47360
Add template email for cancel partnership
2021-04-05 18:13:51 +01:00
stickler-ci
caa2facd47
Fixing style errors.
2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528
Add support for Friday as a holiday and some comment alignment fixes
2021-04-05 19:57:33 +03:00
Laurent Destailleur
2da5d8838d
Fix trans
2021-04-05 15:47:35 +02:00
Laurent Destailleur
95de241245
FIx #yogosha5774
2021-04-05 15:21:17 +02:00
Laurent Destailleur
01eec2b919
FIx #yogosha5774
2021-04-05 15:11:28 +02:00
Laurent Destailleur
5769701cd0
Better example
2021-04-05 15:05:21 +02:00
Laurent Destailleur
6261f23a38
css
2021-04-05 14:58:33 +02:00
Laurent Destailleur
685c880e6c
Debug module workstation
2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea
Fix perm id and sort of modules by id.
2021-04-05 13:52:19 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php
2021-04-05 13:52:09 +02:00
ptibogxiv
93341b1514
FIX uniformization of external link
2021-04-05 13:51:21 +02:00
Laurent Destailleur
f03190e23b
Fix permissions in module workstation
2021-04-05 12:57:43 +02:00
NextGestion
4464903ffc
remove unnecessary files
2021-04-05 11:47:16 +01:00
Laurent Destailleur
7cba3f8a0a
css
2021-04-05 12:41:39 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page
2021-04-05 12:07:51 +02:00
Laurent Destailleur
e048d73487
Show text of permission in tooltip
2021-04-05 11:18:24 +02:00
Damien BENOIT
1bac38eef2
Update company.php
2021-04-04 18:24:58 +02:00
Laurent Destailleur
fd82776f67
Fix
2021-04-04 18:00:07 +02:00
Laurent Destailleur
932d1a6a25
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-04 17:07:07 +02:00
Laurent Destailleur
6fc19c626d
Try fix for #17094
2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
a50ca93a3e
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 16:34:17 +02:00
Laurent Destailleur
f4703aaa00
Merge pull request #17112 from aspangaro/14a33
...
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 16:33:44 +02:00
Laurent Destailleur
93133f1092
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-04 13:43:45 +02:00
Laurent Destailleur
c254d7dded
css
2021-04-04 13:42:58 +02:00
Alexandre SPANGARO
9e8ed661b3
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 08:06:59 +02:00
Alexandre SPANGARO
025304ad6d
Accountancy - Add a constant to enable fk_docdet register
2021-04-04 07:12:01 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
37db3ffb90
Merge pull request #17065 from Hystepik/develop#1
...
Debug feature to import stock movement from csv file
2021-04-04 01:41:14 +02:00
Laurent Destailleur
46c71c244f
Merge pull request #17100 from dolibit-ut/patch-221
...
Create index.html
2021-04-04 01:21:10 +02:00
Laurent Destailleur
f32cc4d011
Merge pull request #17102 from dolibit-ut/patch-222
...
Create index.html
2021-04-04 01:20:57 +02:00
Laurent Destailleur
e0e883b791
Merge pull request #17105 from dolibit-ut/patch-224
...
Update llx_20_c_departements.sql
2021-04-04 01:19:40 +02:00
Laurent Destailleur
9ebb51cdcf
Merge pull request #17104 from dolibit-ut/patch-223
...
Update llx_10_c_regions.sql
2021-04-04 01:19:25 +02:00
Laurent Destailleur
1a70aebba6
NEW Can set a target image in dolcropresize function.
2021-04-04 01:12:25 +02:00
UT from dolibit
44b8ea2b5f
Update llx_20_c_departements.sql
...
Colombia Departamentos
2021-04-03 17:38:31 +02:00
UT from dolibit
bf59287770
Update llx_10_c_regions.sql
2021-04-03 17:19:16 +02:00
Givriz
5ed01f6733
Fix errors phpv8
2021-04-03 17:09:14 +02:00
UT from dolibit
fa1e46cc6a
Create index.html
2021-04-03 16:48:03 +02:00
UT from dolibit
e30f7fb6e6
Create index.html
2021-04-03 16:45:53 +02:00
Youvious
5e9ce734a7
Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype)
2021-04-03 15:14:33 +02:00
Laurent Destailleur
17437670b1
Set include of js as async
2021-04-03 13:24:34 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership
2021-04-03 09:44:21 +01:00
NextGestion
05e267d09c
Fix parameter $notrigger
2021-04-03 09:40:44 +01:00
stickler-ci
eb4d8848e2
Fixing style errors.
2021-04-03 08:29:04 +00:00
NextGestion
6cac5f2212
Create Partnership Module
2021-04-03 09:24:07 +01:00
lmarcouiller
369994fa92
Fix #17073 : Add of select line and mass delete
2021-04-03 10:12:05 +02:00
Laurent Destailleur
231f441876
Look and feel v14
2021-04-03 02:11:16 +02:00
Laurent Destailleur
858693d631
CSS
2021-04-03 01:39:08 +02:00
Laurent Destailleur
5ce9bc5801
FIX #yogosha5748
2021-04-02 23:23:44 +02:00
Laurent Destailleur
92da23945b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:51:14 +02:00
Laurent Destailleur
cbbaecd100
Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr
...
into altairisfr-pr_batch_mask
# Conflicts:
# htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:49:49 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation
2021-04-02 22:43:10 +02:00
Laurent Destailleur
d9a8673ca3
Merge pull request #17078 from dolibit-ut/patch-205
...
Update llx_10_c_regions.sql
2021-04-02 22:35:03 +02:00
Laurent Destailleur
942c6f6687
Merge pull request #17079 from dolibit-ut/patch-206
...
Update llx_20_c_departements.sql
2021-04-02 22:34:41 +02:00
Laurent Destailleur
af17a07d87
Merge pull request #17080 from dolibit-ut/patch-207
...
Update workstation_document.php
2021-04-02 22:34:24 +02:00
Laurent Destailleur
e422d77c28
Merge pull request #17081 from dolibit-ut/patch-208
...
Update workstation_list.php
2021-04-02 22:34:16 +02:00
Laurent Destailleur
b3ce53c9ab
Merge pull request #17082 from dolibit-ut/patch-209
...
Update workstation_note.php
2021-04-02 22:34:06 +02:00
Laurent Destailleur
1c47072c94
Merge pull request #17083 from dolibit-ut/patch-210
...
Update workstation_agenda.php
2021-04-02 22:33:56 +02:00
Laurent Destailleur
b528011392
Merge pull request #17084 from dolibit-ut/patch-211
...
Create index.html
2021-04-02 22:33:48 +02:00
Laurent Destailleur
ecac9d3c47
Merge pull request #17085 from dolibit-ut/patch-212
...
Create index.html
2021-04-02 22:33:38 +02:00
Laurent Destailleur
02c1d65702
Merge pull request #17086 from dolibit-ut/patch-213
...
Create index.html
2021-04-02 22:33:23 +02:00
Laurent Destailleur
51ee0b07c0
Removed duplicate comment
2021-04-02 22:32:52 +02:00
Laurent Destailleur
a9953fdffd
Merge pull request #17087 from dolibit-ut/patch-214
...
Update contact.php
2021-04-02 22:32:19 +02:00
Laurent Destailleur
88c80065c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-02 22:20:24 +02:00
Laurent Destailleur
60e13f6727
FIX #17060
2021-04-02 22:20:13 +02:00
Laurent Destailleur
e0cb175208
Doxygen
2021-04-02 21:49:21 +02:00
Laurent Destailleur
cadef101db
Fix var name
2021-04-02 21:40:33 +02:00
UT from dolibit
828345b69f
Update contact.php
...
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $langs->trans('Order'), $help_url);
2021-04-02 20:58:08 +02:00
