Laurent Destailleur
7cc1e30748
Merge pull request #14638 from OPEN-DSI/new-ticket-public-mail-format
...
NEW format tickets sent by mail in public interface
2020-09-04 22:37:18 +02:00
stickler-ci
ebb69e9d6e
Fixing style errors.
2020-09-04 19:38:49 +00:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet
2020-09-04 21:36:01 +02:00
Cédric
0a09284b8f
FIX one time is enough
2020-09-04 21:32:12 +02:00
Cédric
e84a2ab07c
Fix addline commande.class.php
2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines
2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines
2020-09-04 21:11:58 +02:00
Alexandre SPANGARO
247cc71ef4
Merge remote-tracking branch 'upstream/develop' into 13a8
2020-09-04 20:26:05 +02:00
Laurent Destailleur
c8da9f97a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-04 19:51:22 +02:00
Laurent Destailleur
2e7f588cac
FIX using decimal on stock correction
...
Conflicts:
htdocs/product/stock/product.php
2020-09-04 19:38:56 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet
2020-09-04 19:38:24 +02:00
Laurent Destailleur
0c1a5d9e25
FIX using decimal on stock correction
2020-09-04 19:34:20 +02:00
stickler-ci
1cff5e0e03
Fixing style errors.
2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines
2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php
2020-09-04 17:54:25 +02:00
lvessiller
123d33b47c
NEW format tickets sent by mail in public interface
2020-09-04 17:50:49 +02:00
bahfir abbes
77afbd4412
fix : unuseful truncation of list name elements
2020-09-04 15:58:21 +01:00
Laurent Destailleur
4fdbfa8224
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-04 16:30:55 +02:00
Laurent Destailleur
2e609d448c
Fix error message
2020-09-04 16:30:34 +02:00
Sekan, Tobias
0375f5fd37
Add helper function for table headers with numbers
2020-09-04 15:24:45 +02:00
Laurent Destailleur
7094cec42a
Fix use same duration code 'on 1 letter' than the production duration
...
record, also than tha sprintf.
2020-09-04 14:37:55 +02:00
lvessiller
4f68c694b8
NEW fetch object useless on create ticket trigger
2020-09-04 14:25:13 +02:00
Laurent Destailleur
f2a16d860e
Enhance method fetchByFkProductChild()
2020-09-04 14:05:35 +02:00
Laurent Destailleur
4383f1d00c
Update ProductCombination.class.php
2020-09-04 13:50:22 +02:00
Laurent Destailleur
0ee40402b9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-04 13:35:31 +02:00
Laurent Destailleur
092b66a7f1
Add variation_ref_ext field
2020-09-04 13:35:16 +02:00
Laurent Destailleur
aa031606b9
Merge pull request #14635 from c3do/patch-7
...
NEW endpoint getContacts and Clean results
2020-09-04 13:25:36 +02:00
Laurent Destailleur
e21b3f6681
FIX bad route url to delete subproduct with API
2020-09-04 13:23:11 +02:00
stickler-ci
d743cb6ac2
Fixing style errors.
2020-09-04 11:22:22 +00:00
Laurent Destailleur
35c0bc81e2
Update api_products.class.php
2020-09-04 13:21:10 +02:00
Laurent Destailleur
8e2001a09b
Update api_products.class.php
2020-09-04 13:20:03 +02:00
Laurent Destailleur
9cafd3b97f
Update api_products.class.php
2020-09-04 13:10:30 +02:00
stickler-ci
52c057b9dd
Fixing style errors.
2020-09-04 11:06:43 +00:00
Laurent Destailleur
a98c5b9841
Update api_products.class.php
2020-09-04 13:05:30 +02:00
stickler-ci
962bb0c698
Fixing style errors.
2020-09-04 10:59:38 +00:00
Laurent Destailleur
a93cbafe58
Update api_products.class.php
2020-09-04 12:58:30 +02:00
stickler-ci
d6bf70300a
Fixing style errors.
2020-09-04 10:57:21 +00:00
Laurent Destailleur
a6f6db6b54
Update api_products.class.php
2020-09-04 12:56:06 +02:00
stickler-ci
334224cd2d
Fixing style errors.
2020-09-04 10:55:34 +00:00
Laurent Destailleur
606217fefc
Debug
2020-09-04 12:54:23 +02:00
stickler-ci
8026ee15df
Fixing style errors.
2020-09-04 10:52:55 +00:00
Laurent Destailleur
8ca08de5e6
Debug
2020-09-04 12:51:44 +02:00
Laurent Destailleur
b329a9d886
Update api_products.class.php
2020-09-04 12:45:09 +02:00
Laurent Destailleur
1ceb7c8677
Add ref_ext to product_attribute.
2020-09-04 12:41:56 +02:00
Cédric
9141b6b092
NEW endpoint getContacts and Clean results
...
NEW Get contacts list of a given order
FIX bad function used to unlink a contact
FIX Result for link contact and unlink contact
2020-09-04 12:36:03 +02:00
Laurent Destailleur
e5633e07a2
Update api_products.class.php
2020-09-04 12:28:47 +02:00
Laurent Destailleur
6eb1be02ad
Merge pull request #14630 from OPEN-DSI/new-ticket-card-extrafields-errors
...
NEW manage errors on update extra fields in ticket card
2020-09-04 12:27:25 +02:00
Laurent Destailleur
257bb87c53
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-04 12:25:32 +02:00
Laurent Destailleur
07fc85c222
Fix minor
2020-09-04 12:25:16 +02:00
Cédric
704b83c79a
Multiple fix and features
...
NEW ref_ext for Attributes and Combinations
Clean and improved results for ::getAttributeValues ::getAttributes ::getAttributesById ::getAttributesByRef
FIX delete subproduct endpoint url
2020-09-04 12:24:57 +02:00
lvessiller
85575fd604
NEW translate classification labels in ticket
2020-09-04 12:18:32 +02:00
stickler-ci
8d6c19a432
Fixing style errors.
2020-09-04 10:10:37 +00:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby
...
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
2020-09-04 12:09:30 +02:00
Laurent Destailleur
564a47e41c
Update productlot_list.php
2020-09-04 12:08:10 +02:00
Cédric
b841a4354e
NEW ref_ext for Attributes
2020-09-04 12:06:09 +02:00
Cédric
93959d34c8
NEW fields ref_ext for Attributes and Combinations
2020-09-04 12:01:01 +02:00
Cédric
3a232796d8
Use new function fetchAllByFkProductChild
2020-09-04 11:43:56 +02:00
Cédric
3d926ff3a1
use function getFkProductParentByFkProductChild
2020-09-04 11:38:40 +02:00
Cédric
0f1c3643d7
Use function getFkProductParentByFkProductChild
2020-09-04 11:21:29 +02:00
Cédric
925a1475a1
add ref_ext to ProductCombination.class.php
2020-09-04 11:01:47 +02:00
lvessiller
eb83941e61
NEW manage errors on update extra fields in ticket card
2020-09-04 10:46:05 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
lvessiller
22d4382b83
NEW add extra fields labels and values in mail on create ticket
2020-09-04 09:38:33 +02:00
Laurent Destailleur
1408c862f6
css
2020-09-03 21:23:58 +02:00
Laurent Destailleur
614c188486
css
2020-09-03 19:29:00 +02:00
Laurent Destailleur
aafe323405
css
2020-09-03 19:11:56 +02:00
Laurent Destailleur
3f243aa457
Merge pull request #14622 from kev-73/develop
...
NEW: add week number for month view in agenda
2020-09-03 19:02:59 +02:00
Laurent Destailleur
6ecd566697
Merge pull request #14624 from OPEN-DSI/new-ticket-create-send-trackid-and-context
...
NEW send context and remove new lines on create ticket
2020-09-03 18:58:50 +02:00
Laurent Destailleur
a87797ed66
Debug recruitment module
2020-09-03 18:52:09 +02:00
lvessiller
a4f1ddaad0
NEW send context and remove new lines on create ticket
2020-09-03 17:22:27 +02:00
Laurent Destailleur
3ea9266732
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-03 15:29:14 +02:00
Laurent Destailleur
9a232b6164
Fix menu
2020-09-03 15:29:00 +02:00
stickler-ci
43590587e5
Fixing style errors.
2020-09-03 12:30:04 +00:00
Adrien Raze
bcd9a0b29f
Retours PR
2020-09-03 14:25:17 +02:00
kev-73
38ed033b8a
New: add week number for month view in agenda
...
Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.
2020-09-03 14:03:40 +02:00
Laurent Destailleur
457342ee95
Merge pull request #14541 from TobiasSekan/FixSinglePayWithMultiOnPaymentForun
...
FIX non-numeric value on multicurrency payment (part 2)
2020-09-03 13:26:43 +02:00
Laurent Destailleur
f7f42f7680
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-03 13:19:53 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive
...
FIX: Show bank account only when bank module is active (on invoices)
2020-09-03 13:19:32 +02:00
Laurent Destailleur
fe6d42f9e2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-03 12:56:34 +02:00
Laurent Destailleur
ac8c6954bf
Merge pull request #14607 from aspangaro/13a9
...
New Accountancy - Balance - Move to getNomUrl on accounting account
2020-09-03 12:44:31 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
2fe9000286
Merge pull request #14612 from atm-john/develop_fix_and_factor_price_level
...
Fix and factor fetch combination price level
2020-09-03 12:39:06 +02:00
Laurent Destailleur
9293d1917a
Update ProductCombination.class.php
2020-09-03 12:37:30 +02:00
Laurent Destailleur
1d3c54dd64
Update ProductCombination.class.php
2020-09-03 12:36:57 +02:00
Laurent Destailleur
4da10b5f63
Merge pull request #14614 from aspangaro/13a10
...
New Accountancy Add predefined url in getNomUrl
2020-09-03 12:34:24 +02:00
Laurent Destailleur
87113a77b4
Update accountingaccount.class.php
2020-09-03 12:32:51 +02:00
Laurent Destailleur
67e58f639f
Merge pull request #14615 from atm-lena/FIX_selectModelMailFunction
...
selectModelMail() : if default and no mail models select default model
2020-09-03 12:29:59 +02:00
Laurent Destailleur
b0a15f958f
Merge pull request #14619 from atm-john/11.0_fix_missing_param_for_hook
...
FIX missing param for hook
2020-09-03 12:24:56 +02:00
Laurent Destailleur
f88d2bdbbf
Merge pull request #14618 from TobiasSekan/ShowNumAndClickWarehouseArea
...
NEW Show header number and make it clickable in warehouse area
2020-09-03 12:23:45 +02:00
Laurent Destailleur
03d0ccc1cc
Merge pull request #14621 from TobiasSekan/ShowNumAndClickOnPaymentArea
...
NEW Show header number and make it clickable on payment area
2020-09-03 12:20:38 +02:00
Laurent Destailleur
1a33cd91c9
Update index.php
2020-09-03 12:20:20 +02:00
stickler-ci
06e8e62d38
Fixing style errors.
2020-09-03 09:49:35 +00:00
Sekan, Tobias
8f37f66470
Show number and allow click on payment area
2020-09-03 11:36:11 +02:00
Laurent Destailleur
77d15c9382
Fix long name overlap date
2020-09-03 11:34:20 +02:00
Laurent Destailleur
5af1eff2d9
Fix phpcs
2020-09-03 10:46:46 +02:00
John Botella
c17bc8b3c8
Fix missing param for hook
2020-09-03 10:45:03 +02:00
Sekan, Tobias
38da331a8b
Show number and clickable on warehouse area
2020-09-03 10:41:42 +02:00
stickler-ci
8c514c8025
Fixing style errors.
2020-09-03 08:24:12 +00:00
Adrien Raze
c043501ee5
Retours PR standard
2020-09-03 10:19:57 +02:00
Adrien Raze
0898a1e28a
Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign
2020-09-03 10:06:13 +02:00
Sekan, Tobias
f6b902ad36
Show counts and add links in shipment area
2020-09-03 09:58:28 +02:00
Adrien Raze
675fe05808
Retours PR Standard
2020-09-03 09:51:49 +02:00
atm-lena
197d03f9d9
FIX selectModelMail() : if default and no mail models select default model
2020-09-03 09:23:10 +02:00
Alexandre SPANGARO
b3cd9688d5
Typo
2020-09-02 23:43:47 +02:00
Alexandre SPANGARO
853bacd545
New Accountancy Add predefined url in getNomUrl
2020-09-02 23:43:36 +02:00
Laurent Destailleur
31548c6fbb
Better error message
2020-09-02 21:42:29 +02:00
Laurent Destailleur
f642fc9ad9
Fix
2020-09-02 21:40:17 +02:00
Laurent Destailleur
ed743c9dbb
Fix phpcs
...
More secured sendEmailsReminder()
2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0
Can close a recruitment job
2020-09-02 19:19:47 +02:00
Laurent Destailleur
80f824569a
Use english
2020-09-02 19:15:03 +02:00
Laurent Destailleur
a58dcc3886
Doc
2020-09-02 19:10:07 +02:00
Laurent Destailleur
a984c8e969
Use english
2020-09-02 18:57:56 +02:00
Laurent Destailleur
0572d2e46d
Merge pull request #14385 from egils-consulting/translate-variable-name-and-add-hints
...
Update api_supplier_invoices.class.php
2020-09-02 18:22:50 +02:00
Laurent Destailleur
ab938f2299
Merge pull request #14606 from bafbes/abb120137
...
new : option to hide complementary actions on member subscription
2020-09-02 18:10:30 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation
...
FIX: Contact type translation
2020-09-02 18:09:37 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder
...
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 18:08:40 +02:00
Laurent Destailleur
de3e818ccf
Update html.form.class.php
2020-09-02 18:08:08 +02:00
Laurent Destailleur
31acaf4b4b
Merge pull request #14610 from OPEN-DSI/new-ticket-mail-smtp-config
...
NEW can set a dedicated SMTP config for sending email from public ticket interface
2020-09-02 18:06:37 +02:00
Laurent Destailleur
d913736bd1
Update list.php
2020-09-02 17:59:21 +02:00
Laurent Destailleur
ee003ed499
Update list.php
2020-09-02 17:57:09 +02:00
Laurent Destailleur
2a4f0fc034
Fix backto link
2020-09-02 16:37:02 +02:00
John Botella
cd952f7427
Fix and factor fetch combination price level
2020-09-02 16:24:22 +02:00
stickler-ci
a713286579
Fixing style errors.
2020-09-02 13:58:04 +00:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
Adrien Raze
d6113acfc8
action presign/prevalidate + action sign/validate + Traductions
2020-09-02 15:20:10 +02:00
atm-lena
7b91c8efc8
Event Reminder : Add "Default Mail Model" to select Mail Model
2020-09-02 09:58:55 +02:00
Alexandre SPANGARO
fb88c68ddb
New Accountancy - Balance - Move to getNomUrl on accounting account
2020-09-02 05:15:58 +02:00
Laurent Destailleur
e4557b3dd3
Responsive
2020-09-01 23:04:29 +02:00
Laurent Destailleur
619a9a3679
Look and feel v13
2020-09-01 22:53:49 +02:00
Laurent Destailleur
8e02d39cb3
Fix prefill of end date when event type is rendez-vous
2020-09-01 22:44:03 +02:00
bahfir abbes
47eee354f8
new : option to hide complementary actions
2020-09-01 19:31:44 +01:00
Tim Otte
8a5a171cf8
Added agenda translation
2020-09-01 16:59:40 +02:00
Tim Otte
71471a054d
Loaded the required translations
2020-09-01 16:53:42 +02:00
Laurent Destailleur
def2bd5d6d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-01 16:36:26 +02:00
stickler-ci
028275582a
Fixing style errors.
2020-09-01 14:26:16 +00:00
Alexandre SPANGARO
0336fe5686
NEW Accountancy - On transfers, select the periodicity by default
2020-09-01 16:18:07 +02:00
Laurent Destailleur
f18a852510
Merge pull request #14599 from TobiasSekan/AllowClickOnAllNumOnCommerceOverview
...
NEW Allow click on all header numbers on commerce area
2020-09-01 15:38:42 +02:00
Laurent Destailleur
eb5ac6e9b0
Merge pull request #14595 from ptibogxiv/patch-355
...
NEW standardizes API thirdparties by email with other object
2020-09-01 15:37:17 +02:00
Florian Mortgat
134a47a93f
FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
2020-09-01 15:36:35 +02:00
Laurent Destailleur
30dba9af5b
Merge pull request #14593 from ptibogxiv/patch-354
...
NEW API get users by email / login
2020-09-01 15:35:35 +02:00
Laurent Destailleur
a424515835
Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2
...
Agenda Remind (Part 2 & 3)
2020-09-01 15:33:52 +02:00
Laurent Destailleur
a626b252bd
Optimize code
2020-09-01 15:33:02 +02:00
Laurent Destailleur
265d7b2e0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-01 15:18:10 +02:00
Laurent Destailleur
5d40380a07
Add index on status
2020-09-01 15:17:52 +02:00
atm-lena
1b225706db
FIX create remind : dateremind save
2020-09-01 14:48:03 +02:00
Florian HENRY
0099d98096
Merge remote-tracking branch 'origin/develop' into dev_updatedocker
2020-09-01 14:32:49 +02:00
Sekan, Tobias
ba107361fd
Allow click all num on comm. overview
2020-09-01 13:20:56 +02:00
stickler-ci
763515a4ca
Fixing style errors.
2020-09-01 08:17:19 +00:00
atm-lena
86c6ef23e3
Errors management v2
2020-09-01 10:05:55 +02:00
atm-lena
b747f6285e
Errors management
2020-09-01 10:01:59 +02:00
atm-lena
d2ed43d913
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-09-01 09:43:14 +02:00
atm-lena
13f91f1de8
FIX getEmailTemplat() in sendEmailsReminder() reminder function
2020-09-01 09:41:59 +02:00
Laurent Destailleur
b69a992324
Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS
2020-09-01 04:29:57 +02:00
Laurent Destailleur
e353d4a42d
Add tooltip if label truncated
2020-09-01 03:59:57 +02:00
Laurent Destailleur
d69f08e489
WIP
2020-09-01 01:24:05 +02:00
ptibogxiv
477f33f56c
NEW standardizes API thirdparties by email with other object
2020-08-31 21:45:51 +02:00
Laurent Destailleur
887d4e0603
Add unique key on table of inventory details
2020-08-31 20:02:06 +02:00
Laurent Destailleur
4110f1df05
Responsive
2020-08-31 19:21:33 +02:00
Laurent Destailleur
9dbc9582c1
Code comment
2020-08-31 17:12:31 +02:00
stickler-ci
fcc2ad8c9b
Fixing style errors.
2020-08-31 15:11:05 +00:00
ptibogxiv
c8e0bcd710
NEW API get users by email / login
2020-08-31 17:09:14 +02:00
Laurent Destailleur
0a93954134
Fix regresssion. The reply_to was missing with SMTPS
2020-08-31 17:07:13 +02:00
Laurent Destailleur
0442ed1bd1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-31 17:00:55 +02:00
Laurent Destailleur
49a4f4f1a1
More log
2020-08-31 17:00:43 +02:00
atm-lena
a8c9e76ef6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 16:57:49 +02:00
Laurent Destailleur
1a353a5742
Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal
...
FIX Uniform availability delay description on commercial proposal (new and card)
2020-08-31 16:25:42 +02:00
Laurent Destailleur
ffb3d810de
Complete fix for #14580 for v10 (backport of change of develop)
2020-08-31 16:21:59 +02:00
Laurent Destailleur
54c1be3717
Merge pull request #14560 from ptibogxiv/patch-349
...
NEW display resiliate status in takepos for member
2020-08-31 16:16:39 +02:00
Laurent Destailleur
d11d02a23a
Merge pull request #14586 from ptibogxiv/patch-353
...
NEW change thirdparty with barcode scan in takepos
2020-08-31 16:15:59 +02:00
Laurent Destailleur
deac359502
Merge pull request #14585 from ptibogxiv/patch-352
...
NEW api get member by thirdparty
2020-08-31 16:14:23 +02:00
Laurent Destailleur
0f68854baa
Merge pull request #14591 from TobiasSekan/AvoidUseCurlyBracesOnContactList
...
FIX Avoid use of curly braces on contact list (PHP 7.4+)
2020-08-31 16:13:33 +02:00
Laurent Destailleur
5c2694dcf8
Merge pull request #14584 from ptibogxiv/patch-351
...
NEW API get thirdparty by barcode
2020-08-31 16:08:22 +02:00
Laurent Destailleur
1065e7328e
Merge pull request #14587 from andreubisquerra/master
...
NEW Keep takepos terminal when login/logout
2020-08-31 16:07:09 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Sekan, Tobias
070a09d5cc
Uniform availability desc. on propal
2020-08-31 13:41:22 +02:00
Sekan, Tobias
8b40d17868
avoid use of curly braces on contact list
2020-08-31 08:10:06 +02:00
Laurent Destailleur
3a102cce73
csscss
2020-08-30 20:55:22 +02:00
Laurent Destailleur
8c4e4aba1a
css
2020-08-30 20:31:28 +02:00
Laurent Destailleur
83d70c9856
Fix use new navigation
2020-08-30 19:54:34 +02:00
Laurent Destailleur
02f108835d
Fix tooltip
2020-08-30 19:45:46 +02:00
Laurent Destailleur
d35e374584
css
2020-08-30 19:32:52 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
d94d7a1d0b
Sync transifex
2020-08-30 16:28:07 +02:00
Laurent Destailleur
60ead7cefd
Trans
2020-08-30 13:22:12 +02:00
Laurent Destailleur
3bef07697c
Trans
2020-08-30 13:17:25 +02:00
Laurent Destailleur
e030b2089a
Look and feel v13
2020-08-30 13:14:28 +02:00
stickler-ci
59542cfbcd
Fixing style errors.
2020-08-30 07:41:57 +00:00
jove@bisquerra.com
862c55ea07
NEW Keep takepos terminal when login/logout
2020-08-30 09:19:35 +02:00
Laurent Destailleur
4c0e1d20d6
FIX CSS
2020-08-30 05:28:01 +02:00
Laurent Destailleur
003566706b
FIX CSS
2020-08-30 05:27:07 +02:00
Laurent Destailleur
8bffbb812a
css
2020-08-30 05:24:44 +02:00
Laurent Destailleur
60af9925a8
css
2020-08-30 04:57:15 +02:00
Laurent Destailleur
8adf1852b1
Clean code
2020-08-30 03:00:35 +02:00
Florian HENRY
9614dcf9ec
fix comment
2020-08-29 18:38:26 +02:00
stickler-ci
e18b85ea87
Fixing style errors.
2020-08-29 14:08:42 +00:00
ptibogxiv
d3024fdd1c
Update index.php
2020-08-29 16:07:01 +02:00
ptibogxiv
a963d6c0fc
NEW change thirdparty with barcode scan in takepos
2020-08-29 16:05:14 +02:00
ptibogxiv
6eeb1d3a96
Update invoice.php
2020-08-29 13:36:52 +02:00
ptibogxiv
a64223f73d
Update api_members.class.php
2020-08-29 12:44:17 +02:00
stickler-ci
96b3474185
Fixing style errors.
2020-08-29 10:40:30 +00:00
ptibogxiv
7fe83b24ba
NEW api get member by thirdparty
2020-08-29 12:38:22 +02:00
ptibogxiv
12676d020a
Update api_thirdparties.class.php
2020-08-29 11:43:56 +02:00
stickler-ci
26f812b73b
Fixing style errors.
2020-08-29 09:39:10 +00:00
ptibogxiv
a68d2fe91e
NEW API get thirdparty by barcode
2020-08-29 11:37:16 +02:00
Laurent Destailleur
6293f76692
Debug
2020-08-29 06:17:26 +02:00
Laurent Destailleur
9cba23e458
Fix phpcs
2020-08-29 06:10:18 +02:00
Laurent Destailleur
bca9a84710
Enhance autofill of end date when creating an event
2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
1eaba7d889
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-29 05:13:48 +02:00
Laurent Destailleur
f8bd7946a5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-08-29 05:13:20 +02:00
Laurent Destailleur
e4e5ca3934
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-29 05:09:41 +02:00
Laurent Destailleur
84b2929604
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-29 05:09:34 +02:00
Laurent Destailleur
eb0c76f613
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3
Fix phpcs
2020-08-29 05:07:23 +02:00
Laurent Destailleur
a1a05d55e4
Update admin.lang
2020-08-29 05:03:44 +02:00
Laurent Destailleur
e9c6911a23
Update admin.lang
2020-08-29 05:03:01 +02:00
Laurent Destailleur
bd201052de
Update html.form.class.php
2020-08-29 04:58:07 +02:00
Laurent Destailleur
ca47eb2c9f
Update html.form.class.php
2020-08-29 04:55:24 +02:00
Laurent Destailleur
e80722536d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-29 04:42:29 +02:00
Laurent Destailleur
8e70a731d3
doc
2020-08-29 04:42:14 +02:00
Laurent Destailleur
67a82ac3b5
Merge pull request #14583 from ptibogxiv/patch-350
...
New fetch thirdparty by barcode
2020-08-29 04:28:08 +02:00
Laurent Destailleur
47c5bf5f06
Fix example
2020-08-29 04:22:57 +02:00
Laurent Destailleur
82f93fed92
css
2020-08-29 03:52:27 +02:00
Laurent Destailleur
5eca65f673
css
2020-08-29 02:35:24 +02:00
Laurent Destailleur
983a3c59c8
css
2020-08-29 01:11:08 +02:00
ptibogxiv
00d619d08e
Update societe.class.php
2020-08-28 23:04:05 +02:00
ptibogxiv
8286978ce8
New fetch thirdparty by barcode
...
ie: usefull for fidelity card with barcode/qrcode
if this PR ok, i will push PR for get thirdparty by barcode and change thirdparty by barcode in takepos
2020-08-28 22:44:58 +02:00
Laurent Destailleur
bf06a34139
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/facture/paiement.php
2020-08-28 21:29:35 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Laurent Destailleur
144cc52b20
Merge pull request #14540 from TobiasSekan/FixSingelPaymentWithMulticurrency
...
FIX non-numeric value on multicurrency payment (part 1)
2020-08-28 21:17:32 +02:00
Laurent Destailleur
e5398c8f2d
Update paiement.php
2020-08-28 21:16:33 +02:00
Laurent Destailleur
0acb33fc91
Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail
...
NEW remove new lines in mail on add ticket message
2020-08-28 21:08:17 +02:00
FlorianMortgat
c25463a4ba
+ more parentheses around expression for readability
2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9
+ parentheses around expression for readability
2020-08-28 20:46:35 +02:00
Laurent Destailleur
25f1f1eafb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-28 19:08:08 +02:00
Laurent Destailleur
04ad25d90f
NEW Add the workflow interaction close intervention on closing ticket
2020-08-28 19:07:17 +02:00
Laurent Destailleur
9cd63d68bd
Update admin.lang
2020-08-28 17:58:02 +02:00
lvessiller
c3b095c820
NEW remove new lines in mail on add ticket message
2020-08-28 17:54:57 +02:00
Laurent Destailleur
3f1c2e9d07
Merge pull request #14577 from bafbes/abb120136
...
New option to see complete names of partners
2020-08-28 17:50:18 +02:00
Laurent Destailleur
c4c0b8afd4
Fix
2020-08-28 17:49:30 +02:00
Laurent Destailleur
50b791cfca
Fix css
2020-08-28 17:41:15 +02:00
Laurent Destailleur
9950f2ea83
Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name
...
NEW subject title with company name instead of application title in t…
2020-08-28 17:36:38 +02:00
Laurent Destailleur
0b8d7f329e
FIX added information on user list not visible with multiselect
2020-08-28 17:17:22 +02:00
lvessiller
49098218cb
NEW subject title with company name instead of application title in ticket message
2020-08-28 16:55:28 +02:00
Florian Mortgat
215085e0e6
FIX: unit price divided by quantity when accepting supplier price proposal
2020-08-28 15:51:39 +02:00
bahfir abbes
a031a10f77
fix:option to see complete names of partners
2020-08-28 13:34:40 +01:00
Sekan, Tobias
9c54f8831f
Show bank only when active (on new)
2020-08-28 13:08:04 +02:00
Sekan, Tobias
216e22e505
Show bank only when bank module is active
2020-08-28 12:53:30 +02:00
Florian Mortgat
7ddf85cd33
Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot
2020-08-28 10:05:00 +02:00
Florian Mortgat
a5d1f1f68f
FIX: expenses lines overlapping the frame for total amounts.
...
If there is no room for this frame when printing the last expense line, this line should be on a new page.
2020-08-28 10:02:43 +02:00
atm-lena
6562334f7b
FIX sendEmailsReminder() function
2020-08-28 09:37:18 +02:00
Laurent Destailleur
30838f01d4
Fix warning
2020-08-27 22:03:52 +02:00
Laurent Destailleur
d40f90fecb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/index.php
2020-08-27 22:00:10 +02:00
Laurent Destailleur
e52d71a880
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-27 21:58:29 +02:00
Laurent Destailleur
00fce1d18a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-27 21:58:23 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
57951e1285
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-27 21:52:47 +02:00
Laurent Destailleur
c6bdd27d4c
FIX #14530
2020-08-27 21:52:25 +02:00
Laurent Destailleur
8f34f4c1c5
FIX #14530
2020-08-27 21:46:28 +02:00
Laurent Destailleur
1b77dc4e13
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 21:19:06 +02:00
Laurent Destailleur
c419e2f0de
Sanitize vars
2020-08-27 21:18:49 +02:00
Laurent Destailleur
fe4acf4e4e
NEW Add focus when editing on product/stock/product.php Close #14548
2020-08-27 21:18:40 +02:00
Laurent Destailleur
4624cf98ee
Merge pull request #14545 from cfoellmann/defaults-payment-selections
...
FIX allow use of default settings for payment term and condition on proposal creation
2020-08-27 21:04:10 +02:00
Laurent Destailleur
f997d11761
Update card.php
2020-08-27 21:02:01 +02:00
Laurent Destailleur
7730569dff
Update card.php
2020-08-27 21:00:01 +02:00
Laurent Destailleur
f4793f505e
Merge pull request #14532 from StephaneLesage/import-thirdparty-mothercompany-debtlimit-bank-incoterms
...
NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
2020-08-27 20:12:36 +02:00
Laurent Destailleur
9f8d1f0e63
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents
...
NEW Show user on external calender events (when found)
2020-08-27 20:10:13 +02:00
Laurent Destailleur
b6e9ba8ed6
Merge pull request #14535 from aspangaro/13a6
...
Some fix on assets
2020-08-27 20:01:33 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php
2020-08-27 19:59:46 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
Laurent Destailleur
e95361fed4
Merge pull request #14536 from ptibogxiv/patch-347
...
Fix for better code
2020-08-27 19:57:34 +02:00
Laurent Destailleur
a3e94a670b
Merge pull request #14554 from bb2a/filter_warehous_order
...
Remove warehouse search
2020-08-27 19:56:55 +02:00
Laurent Destailleur
094b2e84a6
Merge pull request #14566 from TobiasSekan/FixEmptyRefInContractListToolTip
...
FIX - Empty references in contract service list tool tip
2020-08-27 19:54:37 +02:00
Laurent Destailleur
829ef1ae0b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 19:52:21 +02:00
Laurent Destailleur
741489fdc0
FIX #14564
2020-08-27 19:52:05 +02:00
Laurent Destailleur
84a096e234
Merge pull request #14555 from aspangaro/12.0p8
...
Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink
2020-08-27 19:45:55 +02:00
Laurent Destailleur
8a9244d1d6
Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions
...
NEW - Show references in contract form on interventions
2020-08-27 19:44:51 +02:00
Laurent Destailleur
6715eaee09
Update html.formcontract.class.php
2020-08-27 19:44:17 +02:00
Laurent Destailleur
57c8835fcc
Merge pull request #14565 from atm-john/develop_fix_14562
...
Fix #14562 Unable to create table `llx_product_attribute_combination_price_level` upon clean install
2020-08-27 19:42:50 +02:00
Laurent Destailleur
a80950dfa4
Fix regression
2020-08-27 19:41:32 +02:00
Laurent Destailleur
8b95aa63eb
Trans
2020-08-27 18:59:36 +02:00
Laurent Destailleur
0309510ab8
Fix avoid duplicate event recorded from email collector
2020-08-27 18:50:08 +02:00
Laurent Destailleur
2abdfe08d7
FIX Email collector decode subject
...
FIX Cloning email collector clone also rules and operations
2020-08-27 18:27:05 +02:00
atm-lena
c0f254d10c
Translation + decode
2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
atm-lena
f57325237a
WIP : sendEmailsReminder()
2020-08-27 12:30:59 +02:00
atm-lena
acb50950a4
Add a default message to "actioncomm_send" template
2020-08-27 11:31:48 +02:00
atm-lena
5856033892
Replace "agenda_send" and "event_push" to "actioncomm_send"
2020-08-27 11:15:08 +02:00
atm-lena
69459e3429
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-27 11:13:21 +02:00
Laurent Destailleur
180a49601b
Use CSS to define size of logo on public pages.
2020-08-27 11:01:41 +02:00
stickler-ci
b0fe7bc2e0
Fixing style errors.
2020-08-27 08:47:57 +00:00
atm-lena
4ef2644300
Use date.lib.php functions
2020-08-27 10:29:23 +02:00
stickler-ci
8ff24282d9
Fixing style errors.
2020-08-27 08:16:32 +00:00
Sekan, Tobias
c2590433fe
Show ref in contract form on interventions
2020-08-27 10:11:18 +02:00
atm-lena
9d1fc28eba
Fix type reminder "push" to "browser"
2020-08-27 09:35:02 +02:00
atm-lena
bbc554070c
Fix
2020-08-27 09:33:40 +02:00
Sekan, Tobias
aa8ec1cd9c
Fix empty ref in contract list tool tip
2020-08-27 09:32:00 +02:00
Laurent Destailleur
4127fded2a
WIP
2020-08-27 03:14:55 +02:00
ATM john
236d2862af
Fix install table
2020-08-26 21:56:50 +02:00
atm-lena
6a60228bc3
Translation
2020-08-26 17:11:32 +02:00
Laurent Destailleur
243f59b9e9
FIX Missing transaction on PO actions
2020-08-26 17:09:45 +02:00
atm-lena
efe60ebc58
Error management
2020-08-26 17:02:34 +02:00
atm-lena
cc29654f47
WIP : rename fk_project to fk_actioncomm + add line to sql file to install
2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7
Add fk_email_template
2020-08-26 16:06:20 +02:00
Florian Mortgat
9b3f13458f
FIX: missing entity check
2020-08-26 16:02:31 +02:00
atm-lena
cf9337b644
Add fk_project to actioncommreminder object
2020-08-26 15:58:14 +02:00
atm-lena
c10556473f
Clean
2020-08-26 15:35:12 +02:00
atm-lena
552e655668
Add field "entity" in actioncommrminder object and table
2020-08-26 15:22:32 +02:00
atm-lena
1267e914dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-26 15:16:53 +02:00
atm-lena
d4e6a9871c
Update select_type_duration() function
2020-08-26 15:14:07 +02:00
atm-lena
2fb5824836
Calcul date of reminder for event create
2020-08-26 15:12:08 +02:00
atm-lena
d3ac39589a
WIP
2020-08-26 12:48:12 +02:00
stickler-ci
eecab28203
Fixing style errors.
2020-08-26 10:22:33 +00:00
ptibogxiv
989130c0ad
Update invoice.php
2020-08-26 12:20:49 +02:00
ptibogxiv
76e276e8e8
Update invoice.php
2020-08-26 12:00:45 +02:00
stickler-ci
32ecf4dd9a
Fixing style errors.
2020-08-26 09:46:49 +00:00
ptibogxiv
66cdb1dad0
NEW display resiliate status in takepos for member
2020-08-26 11:44:35 +02:00
atm-lena
42f492877e
WIP
2020-08-26 11:36:32 +02:00
atm-lena
3046556d7b
Add checkbox "AddReminder"
2020-08-26 11:19:14 +02:00
atm-lena
a4018f41f7
WIP
2020-08-26 10:52:36 +02:00
lvessiller
9268955256
FIX set sales representatives on create company card
2020-08-26 09:40:20 +02:00
Alexandre SPANGARO
0adf267f66
Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink
2020-08-25 21:31:04 +02:00
Laurent Destailleur
23bb67873f
NEW Can edit the list of sending email profiles.
2020-08-25 19:40:17 +02:00
atm-lena
7df993c7ed
Add "select_model_mail" function + add select to create event
2020-08-25 17:26:32 +02:00
Anthony Berton
458bc66327
Update list.php
2020-08-25 17:25:34 +02:00
atm-lena
6a94c0f52f
Add model type mail
2020-08-25 16:43:57 +02:00
atm-lena
94b2f3c5e1
Add $conf conditions
2020-08-25 12:57:36 +02:00
Laurent Destailleur
6f1a51139c
Fix load lang
2020-08-25 12:48:56 +02:00
Laurent Destailleur
7c39543c72
Support trigger in module recruitment
...
Enhance generic code of automatic recording events
2020-08-25 12:47:38 +02:00
atm-lena
25840c2b3d
Create Event - Add fields
2020-08-25 12:40:29 +02:00
stickler-ci
2cbb4081fe
Fixing style errors.
2020-08-25 10:20:48 +00:00
Sekan, Tobias
a7895f3496
Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents
2020-08-25 12:20:10 +02:00
Sekan, Tobias
4c851884e5
Address feedback
2020-08-25 12:16:44 +02:00
Laurent Destailleur
c2e98c7c90
tooltip
2020-08-25 03:31:31 +02:00
Laurent Destailleur
7b5b3cf8a2
Add br
2020-08-25 02:28:08 +02:00
Laurent Destailleur
8c9f6db856
Label in popup
2020-08-25 02:27:32 +02:00
Laurent Destailleur
f9eccce26c
Fix phpcs
2020-08-24 20:43:38 +02:00
Laurent Destailleur
3dfda2ae60
FIX Emailcollector - decode extracted
...
NEW Rule "email to" accept wildcard *
2020-08-24 20:41:27 +02:00
Laurent Destailleur
60d76000d7
Fix bad column name
2020-08-24 17:23:33 +02:00
Laurent Destailleur
21633e3d39
css
2020-08-24 17:10:27 +02:00
Laurent Destailleur
05d82a0684
FIX Error management. Do no try to approve PO if validation fails.
2020-08-24 17:07:30 +02:00
stickler-ci
a60968e95b
Fixing style errors.
2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34
allow default settings for "cond_reglement_id" and "mode_reglement_id"
...
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
2020-08-24 16:08:44 +02:00
Sekan, Tobias
6d2aa6b654
Fix non-numeric value
2020-08-24 15:26:06 +02:00
Sekan, Tobias
4c887d6110
Fix for non-numeric value in payment
2020-08-24 14:53:34 +02:00
ptibogxiv
ff621cb146
Update pay.php
2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955
Fix for better code
2020-08-24 12:26:40 +02:00
Alexandre SPANGARO
335f57f9be
Fix language
2020-08-24 11:41:00 +02:00
Alexandre SPANGARO
eebe888377
Some fix on assets
2020-08-24 09:47:37 +02:00
Christian Foellmann
b1849aed5c
fix for mistakenly uncommented code
2020-08-24 07:53:25 +02:00
stickler-ci
721b1275ff
Fixing style errors.
2020-08-23 23:20:07 +00:00
StephaneLesage
5aac080e61
NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
2020-08-24 01:01:35 +02:00
Laurent Destailleur
14a4cae95b
Fix
2020-08-24 00:31:25 +02:00
Laurent Destailleur
689fa752bf
Implement action "Decline"
2020-08-24 00:23:18 +02:00
Laurent Destailleur
633f03e853
Add extrafields for recruitment
2020-08-24 00:09:04 +02:00
andreubisquerra
915aa56a95
Change variable to pos_change
2020-08-23 22:29:55 +02:00
andreubisquerra
8f933c324a
Change variable to pos_change
2020-08-23 22:28:26 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change
2020-08-23 22:27:18 +02:00
andreubisquerra
ec2479a41a
Update 12.0.0-13.0.0.sql
2020-08-23 22:26:22 +02:00
andreubisquerra
f9913be719
Change variable to pos_change
2020-08-23 22:24:46 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change
2020-08-23 22:22:05 +02:00
Laurent Destailleur
f010e44a71
WIP
2020-08-23 22:13:06 +02:00
Laurent Destailleur
80ccb84fb2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-23 22:11:33 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
5aaf567f22
Merge pull request #14364 from bafbes/abb120130
...
fix: restore autofill lost functionality on expeditions
2020-08-23 19:52:21 +02:00
Laurent Destailleur
a6f838a6e0
Update card.php
2020-08-23 19:51:13 +02:00
Laurent Destailleur
0944e8b156
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-23 19:25:13 +02:00
Laurent Destailleur
8115acbf82
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a
Fix include regression
2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-08-23 19:20:50 +02:00
Laurent Destailleur
49f8a6e733
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:17:12 +02:00
Laurent Destailleur
4fa6d86127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:17:01 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php
2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php
2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php
2020-08-23 19:11:19 +02:00
Laurent Destailleur
815269db9c
FIX #14443
2020-08-23 18:49:19 +02:00
Laurent Destailleur
477c3e719d
Fix phpcs
2020-08-23 18:26:42 +02:00
Laurent Destailleur
90e01888d4
Merge pull request #14507 from pstructures/PSdevelop
...
Projects added as type in Categories API
2020-08-23 18:25:08 +02:00
Laurent Destailleur
55c0c1d734
Merge pull request #14514 from FHenry/develop
...
fix php warning : count parameters must be countable
2020-08-23 18:22:35 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar
2020-08-23 18:21:18 +02:00
Laurent Destailleur
2b8a1570f9
Merge pull request #14512 from StephaneLesage/import-product-warehouse-usebatch
...
NEW: Products Import/Export 'default warehouse' and 'use batch' fields
2020-08-23 18:19:59 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents
...
NEW Show place from events on import calender
2020-08-23 18:11:02 +02:00
Laurent Destailleur
e32b99fb21
Merge pull request #14515 from ptibogxiv/patch-346
...
Fix Stripe icon in balance list
2020-08-23 18:10:11 +02:00
Laurent Destailleur
9c74211873
Merge pull request #14508 from b92/develop
...
NEW Add __TYPE__ substitution key
2020-08-23 18:09:49 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5
...
Some fix on complete_head_from_modules
2020-08-23 18:09:15 +02:00
Laurent Destailleur
6685cc5bc8
Update admin.lang
2020-08-23 18:07:18 +02:00
Laurent Destailleur
bd7261a449
Debug recruitment module
2020-08-23 18:04:52 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang
2020-08-23 18:04:02 +02:00
Laurent Destailleur
a4c34c2bc5
NEW Add Manufacturing Orders into the automatic ECM
2020-08-23 15:19:03 +02:00
Laurent Destailleur
3fe0ffe7e2
Add unique index on email_msgid of candidatures
2020-08-23 15:18:31 +02:00
Laurent Destailleur
34d2d9a7c6
Look and feel v13
2020-08-23 15:17:22 +02:00
Laurent Destailleur
ca2a34a4c9
Standardize code: Rename fields date_m into tms. All timestamp fields
...
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
46a6161323
Trans
2020-08-23 13:30:05 +02:00
Alexandre SPANGARO
bf28201685
Fix Missing language key
2020-08-23 07:13:43 +02:00
Alexandre SPANGARO
015e1a8dab
Merge branch '12.0' into 12.0_p7
2020-08-23 07:07:47 +02:00
Laurent Destailleur
f56b7c5330
Removed one useless column
2020-08-23 02:45:19 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
andreubisquerra
e36eb42568
Fix travis
2020-08-22 18:46:39 +02:00
andreubisquerra
e8c8cb53cb
Fix travis
2020-08-22 18:45:54 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
e9346298b2
trans
2020-08-22 15:48:42 +02:00
Laurent Destailleur
03af14294a
Standardize code. Debug module HRM
2020-08-22 15:29:19 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
Laurent Destailleur
ac1ae7a0d2
Debug
2020-08-22 04:05:31 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
f07a09bc80
Fix missing include
2020-08-22 02:19:58 +02:00
Laurent Destailleur
f4ed84f27d
Trans
2020-08-21 22:18:02 +02:00
Laurent Destailleur
a508e7ae08
Migration
2020-08-21 22:17:20 +02:00
Laurent Destailleur
e6616563d2
Fix size of field
2020-08-21 22:01:28 +02:00
Laurent Destailleur
6ad18ceef0
Remove useless code
2020-08-21 19:48:31 +02:00
stickler-ci
183013e9ed
Fixing style errors.
2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe
Parse priority and transparency from external calender events
2020-08-21 13:57:03 +02:00
Laurent Destailleur
1b22de5652
Fix phpcs
2020-08-21 13:22:49 +02:00
Laurent Destailleur
b80ba1179f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/accountancy/expensereport/lines.php
htdocs/accountancy/supplier/lines.php
2020-08-21 13:19:28 +02:00
Laurent Destailleur
b6af947042
Fix phpcs
2020-08-21 13:06:54 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
stickler-ci
61cce2e700
Fixing style errors.
2020-08-21 06:46:00 +00:00
Sekan, Tobias
22ff5a320f
fix not working external calender on/off
2020-08-21 08:40:23 +02:00
Sekan, Tobias
bb1452917b
fix wrong event percentage
2020-08-21 08:33:19 +02:00
Sekan, Tobias
ba98db934d
Show user on external calender events
2020-08-21 08:18:26 +02:00
Alexandre SPANGARO
065ace5301
Fix Missing language key on rights
2020-08-21 05:26:07 +02:00
Alexandre SPANGARO
76315fa6ac
Fix Missing language key on rights
2020-08-21 05:22:31 +02:00
Alexandre SPANGARO
dd87362ce3
Fix Missing language key on rights
2020-08-21 05:20:53 +02:00
Alexandre SPANGARO
646d5cc9c8
Fix Missing language key on rights
2020-08-21 05:19:57 +02:00
Alexandre SPANGARO
881a9b7c04
Fix Missing language key on rights
2020-08-21 05:10:19 +02:00
Alexandre SPANGARO
bd5e35c15f
Fix Missing language key
2020-08-21 05:00:38 +02:00
Alexandre SPANGARO
142ce7c03f
Fix Missing language key
2020-08-21 04:58:21 +02:00
Laurent Destailleur
461c37c4a8
Clean code
2020-08-21 01:28:40 +02:00
Laurent Destailleur
b2ed69100b
Trans
2020-08-21 01:18:06 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
0390111132
Add column bomtype
2020-08-20 23:32:35 +02:00
Laurent Destailleur
eb15a8e4db
Enhance email collector module
2020-08-20 23:03:57 +02:00
Alexandre SPANGARO
f1f579ad67
Some fix on complete_head_from_modules
2020-08-20 22:17:34 +02:00
ptibogxiv
eba4d44c81
Fix Stripe icon in balance list
2020-08-20 20:24:00 +02:00
Laurent Destailleur
3ebcd191bd
NEW Add filter rules "is answer" and "is not answer" in email collector
2020-08-20 20:16:38 +02:00
Laurent Destailleur
605642d96a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-20 19:01:03 +02:00
Laurent Destailleur
66f9f37f41
Minor code and doc enhancement
2020-08-20 19:00:43 +02:00
florian HENRY
0453dd8f09
fix php warning : count parameters must be countable
2020-08-20 16:39:14 +02:00
stickler-ci
3c108e8bbf
Fixing style errors.
2020-08-20 13:31:48 +00:00
Christian Foellmann
179fc2e70a
hide other eatby sellby dates
2020-08-20 15:27:34 +02:00
StephaneLesage
ad6fe8c6b6
NEW: Products Import/Export 'default warehouse' and 'use batch number' fields
2020-08-20 13:51:17 +02:00
Christian Foellmann
a5b4fcedb7
hide eatby sellby in reception
2020-08-20 12:48:23 +02:00
Laurent Destailleur
95c25bc1b7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-20 12:21:55 +02:00
Laurent Destailleur
fbb162aa9b
Trans
2020-08-20 12:21:40 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state'
2020-08-20 12:14:40 +02:00
Christian Foellmann
b74113e2eb
hide eatby sellby on expedition
2020-08-20 12:13:27 +02:00
Christian Foellmann
b777c62557
hide eatby sellby on product/stock/product
2020-08-20 12:13:05 +02:00
Sekan, Tobias
546571a6f8
Show place from events on import calender
2020-08-20 08:20:00 +02:00
Bernard Saulme
d947ade7db
Update adherent.class.php
...
NEW Add _TYPE__ substitution key
2020-08-19 21:19:56 +02:00
Mr Matthew Sidnell
c2a81341ad
Updated Lint Issies
2020-08-19 16:27:00 +01:00
Matt Sidnell
b3f078a687
Updated the categories API to allow projects as type
2020-08-19 16:20:16 +01:00
Christian Foellmann
df3fcec6c6
hide dates on erassortlot.php
2020-08-19 16:44:45 +02:00
Christian Foellmann
2873e6bdca
hide dates in productlot_list
2020-08-19 16:33:41 +02:00
stickler-ci
8191447007
Fixing style errors.
2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de
hide eatby, sellby dates
2020-08-19 16:33:41 +02:00
Laurent Destailleur
3281d5ec17
Merge pull request #14451 from josemariagomezroncero/patch-7
...
Bug, this option disable topic input.
2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264
Update mails_templates.php
2020-08-19 14:38:02 +02:00
Laurent Destailleur
25dfd32e0b
Merge pull request #14456 from andreubisquerra/master
...
NEW: Delayed payment in TakePOS
2020-08-19 14:36:34 +02:00
Laurent Destailleur
ea478721e7
Update invoice.php
2020-08-19 14:36:03 +02:00
Laurent Destailleur
f57f729d40
Update invoice.php
2020-08-19 14:35:15 +02:00
Laurent Destailleur
cfc6ee4f67
Merge pull request #14497 from megalogi/patch-2
...
Passing $totalarray as parameter to printFieldListFooter Hook's
2020-08-19 14:16:26 +02:00
Laurent Destailleur
8057ccb223
Update task.class.php
2020-08-19 14:13:30 +02:00
abichotte
1c6a062486
FIX|fix #14502 fix to create a task for a project with api
2020-08-19 11:24:32 +02:00
Alexandre SPANGARO
fbd4323dd8
Fix Accountancy - Show label account in page already bind
2020-08-19 06:01:10 +02:00
Laurent Destailleur
90545ac443
css
2020-08-19 01:59:03 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Abdessalam@MEGALOGI
7f540ac6f0
Passing $totalarray as a parameter to printFieldListFooter Hook's
...
Sometimes, we need $totalarray to know nbfield or to display some vars in the footer of list.
2020-08-18 23:27:36 +01:00
Laurent Destailleur
53522fb8dd
Fix popup on objects in modulebuilder
2020-08-18 18:41:36 +02:00
Laurent Destailleur
3e91d77920
FIX Update extrafields on warehouse
2020-08-18 18:35:40 +02:00
Laurent Destailleur
afe8f76a4a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/stock.php
2020-08-18 15:41:57 +02:00
Laurent Destailleur
3556004f02
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-18 15:35:43 +02:00
Laurent Destailleur
d4a502629e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/stock.php
htdocs/core/lib/ajax.lib.php
2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d
FIX Setup of stock increase/decrease
2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9
Debug generation of document for warehouse
2020-08-18 14:55:56 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
6ce9d573e2
Trans
2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3
Add class reposition on some buttons
2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Juanjo Menent
e685a96716
FIX: Intervention lose html tags when updating
2020-08-18 13:44:50 +02:00
Laurent Destailleur
e65e4a6d47
Beautify for of member module
2020-08-18 11:52:00 +02:00
Laurent Destailleur
2ca0d67072
Removed section of files to download into POS
2020-08-18 11:20:02 +02:00
Alexandre SPANGARO
3e80c71713
NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules
2020-08-18 07:38:46 +02:00
Alexandre SPANGARO
8e0dfc8621
Fix oddeven
2020-08-18 06:28:16 +02:00
Alexandre SPANGARO
c3a23b0415
Remove admin access on option
2020-08-18 06:23:35 +02:00
Laurent Destailleur
79802be58b
Fix phpcs
2020-08-18 00:29:13 +02:00
Laurent Destailleur
e3145d4195
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-17 23:31:07 +02:00
Laurent Destailleur
4f93de6d0b
Fix phpcs
2020-08-17 23:30:53 +02:00
Laurent Destailleur
b623d79525
Merge pull request #14488 from egils-consulting/patch-10
...
Update admin.lang
2020-08-17 22:21:09 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4
...
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Laurent Destailleur
6662e216f7
Fix phpcs
2020-08-17 21:59:50 +02:00
Laurent Destailleur
e3beec3e1f
Fix css
2020-08-17 20:57:44 +02:00
Laurent Destailleur
9f1e4a6da8
css
2020-08-17 20:55:02 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
5952ae28b8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-17 19:54:32 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
Laurent Destailleur
68b6fdb508
Fix missing tags
2020-08-17 19:48:05 +02:00
Laurent Destailleur
0245eb102c
Fix css on fields that are not mandatory
2020-08-17 19:44:06 +02:00
Laurent Destailleur
e891250fb3
Reduce log
2020-08-17 17:40:08 +02:00
Laurent Destailleur
e69e165bae
css
2020-08-17 17:37:44 +02:00
Laurent Destailleur
69d73ac528
FIX Compatibility with modules without document generation
...
Conflicts:
htdocs/core/actions_addupdatedelete.inc.php
2020-08-17 16:08:38 +02:00
Laurent Destailleur
8bfa6df1a6
FIX Update extrafields on line only if it is supported
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2020-08-17 16:06:36 +02:00
Laurent Destailleur
bdcb945dda
Work on inventory
2020-08-17 16:04:12 +02:00
Laurent Destailleur
c3e3baaca0
FIX Compatibility with modules without document generation
2020-08-17 15:54:07 +02:00
Laurent Destailleur
8e00c9c304
FIX Update extrafields on line only if it is supported
2020-08-17 15:53:33 +02:00
Egil Priskorn
bf18f56056
Update admin.lang
...
Small typo
2020-08-17 15:33:36 +02:00
Alexandre SPANGARO
498431fa6f
NEW Add a start date to begin binding in accountancy
2020-08-17 15:27:05 +02:00
John Botella
6e1702c1a5
Fix infinite fetch object linked loop
2020-08-17 15:00:31 +02:00
Laurent Destailleur
d1323f55bb
NEW: Module Reception (for a more accurate management of your
...
receptions) moved from experimental to stable
2020-08-17 14:10:43 +02:00
Laurent Destailleur
75d368b706
Better translation of option
2020-08-17 14:08:52 +02:00
Laurent Destailleur
5be10f133c
Fix several regressions with variants creation
2020-08-17 13:55:18 +02:00
Laurent Destailleur
96d4eeb8be
Fix syntax error
2020-08-17 12:24:32 +02:00
Laurent Destailleur
15e7cd0fb3
Fix doxygen
2020-08-17 05:54:22 +02:00
Laurent Destailleur
cf73c2d8e1
Fix travis
2020-08-17 05:26:32 +02:00
Laurent Destailleur
9712e3d28f
Fix travis
2020-08-17 05:09:27 +02:00
Laurent Destailleur
f6c444c235
css
2020-08-17 05:03:44 +02:00
Laurent Destailleur
86a31d17a5
Better test
2020-08-17 04:34:53 +02:00
Laurent Destailleur
5987504fa5
Better test
2020-08-17 04:34:03 +02:00
asolslk
5a6f459db5
Update accounting.lib.php
2020-08-17 04:09:12 +02:00
Laurent Destailleur
75f8fe8276
Merge pull request #14427 from asolslk/patch-2
...
FIX Visible 0 on accounting account
2020-08-17 01:34:57 +02:00
Laurent Destailleur
4043e4ed3b
Merge pull request #14429 from grandoc/new_branch_08_08_2020
...
New branch 08 08 2020
2020-08-17 00:04:08 +02:00
Laurent Destailleur
f758a8345e
Merge branch 'develop' into translate-variable-name-and-add-hints
2020-08-16 23:52:48 +02:00
Laurent Destailleur
f26a287d10
Update api_supplier_invoices.class.php
2020-08-16 23:50:01 +02:00
Laurent Destailleur
b7c38f4617
Merge pull request #14433 from c3do/patch-1
...
NEW Triggers Attributes and Attributes values
2020-08-16 23:45:32 +02:00
Laurent Destailleur
a76d4daff8
Merge pull request #14444 from fmarcet/11.0
...
FIX: Visualization rights correction on last modified contacts box
2020-08-16 23:37:23 +02:00
Laurent Destailleur
99809b487e
Standardize code
2020-08-16 23:33:50 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
...
NEW : Declinaison price level compatibility
2020-08-16 23:18:49 +02:00
Laurent Destailleur
657e6a2037
No warning
2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996
FIX #14469
2020-08-16 23:13:27 +02:00
Alexandre SPANGARO
6374a2b8cc
Some fix
2020-08-16 22:31:21 +02:00
Alexandre SPANGARO
3c35b20b54
Dict - Insert number 41
2020-08-16 22:17:28 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Laurent Destailleur
c407a19563
Remove type= from script tags
2020-08-16 22:03:11 +02:00
Laurent Destailleur
8992d38bea
Merge pull request #14482 from b92/develop
...
NEW Add __MEMBER_TYPE__ substitution key
2020-08-16 21:17:09 +02:00
Laurent Destailleur
03e8a0737c
Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity
...
FIX param entity in html form file
2020-08-16 21:16:28 +02:00
Laurent Destailleur
f6c1a14d50
CSS
2020-08-14 21:22:45 +02:00
josemariagomezroncero
134bd11f47
Update mails_templates.php
2020-08-14 21:19:51 +02:00
Laurent Destailleur
695420eb8b
CSS
2020-08-14 21:18:06 +02:00
Laurent Destailleur
2adac8e233
CSS
2020-08-14 21:11:55 +02:00
Bernard Saulme
52b84a3ea2
Update functions.lib.php
2020-08-14 18:08:59 +02:00
Laurent Destailleur
73c1184195
Fix phpcs
2020-08-14 13:23:41 +02:00
Laurent Destailleur
65ceaac42e
Better message
2020-08-14 12:56:17 +02:00
lvessiller
d5acc85ef0
FIX param entity in html form file
2020-08-14 12:18:28 +02:00
Laurent Destailleur
6851e24c3b
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0
2020-08-14 12:02:40 +02:00
Laurent Destailleur
d8c6e17efd
Fix travis
2020-08-14 11:59:51 +02:00
Laurent Destailleur
fe0b1c5ee4
Fix travis
2020-08-14 11:53:54 +02:00
Laurent Destailleur
52f20a1047
Fix travis
2020-08-14 11:52:21 +02:00
lvessiller
39a422ef94
FIX update margins rates on object line edit
2020-08-14 11:48:53 +02:00
Laurent Destailleur
a916f6af59
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
2b393d04e1
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0
2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b
Fix trans
2020-08-14 11:03:12 +02:00
Laurent Destailleur
9e8ed3bf54
Merge pull request #14445 from atm-john/11.0_fix_lang
...
Fix lang fr
2020-08-14 03:28:42 +02:00
Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop
...
Security Fix for Cross-site Scripting (XSS) - huntr.dev
2020-08-14 03:17:35 +02:00
Laurent Destailleur
a2f50770f8
Merge pull request #14449 from cfoellmann/default-unit
...
set default unit to `PRODUCT_USE_UNITS` value
2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates
...
NEW: new line template: hidden conf to fill service dates from the last service line
2020-08-14 02:50:24 +02:00
Laurent Destailleur
1d18c83439
Merge pull request #14463 from andreubisquerra/develop
...
Avoid empty sales and orders when all lines are removed.
2020-08-14 02:48:48 +02:00
Laurent Destailleur
aeb11344c6
Merge pull request #14464 from atm-thibaultf/FIX_allow_float_on_stock_alert
...
Allow float for stock limit alert and desired stock
2020-08-14 02:46:08 +02:00
lvessiller
f385e02c53
FIX title button attribute id empty
2020-08-13 17:43:18 +02:00
stickler-ci
d784c621c9
Fixing style errors.
2020-08-13 15:07:06 +00:00
Adrien Raze
990217fcb0
FIX : task leftmenu
2020-08-13 16:59:27 +02:00
Laurent Destailleur
7ce1d36b59
FIX Category for suplements not saved
2020-08-13 13:51:08 +02:00
Laurent Destailleur
88c07e86ad
Organization of setup for Takepos bar features
2020-08-13 13:46:53 +02:00
stickler-ci
959ccce777
Fixing style errors.
2020-08-13 09:48:28 +00:00
John Botella
2405082bb1
Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge
2020-08-13 11:46:07 +02:00
John Botella
4e1f554c15
Fix - add variation price fallback behavior
2020-08-13 11:43:33 +02:00
Laurent Destailleur
f22398a9d3
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0
2020-08-12 20:26:01 +02:00
Laurent Destailleur
355d62e7db
FIX Update line of BOM
2020-08-12 20:24:44 +02:00
stickler-ci
1cc673a9c6
Fixing style errors.
2020-08-12 08:53:24 +00:00
John Botella
41cbe6db12
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge
2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf
Add declinaison price level
2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb
Modify int to float for stock limit alert and desired stock
2020-08-12 09:09:59 +02:00
andreubisquerra
8c5a86cb72
Avoid empty sales and orders when all lines are removed.
2020-08-12 07:07:18 +02:00
stickler-ci
ef78b85062
Fixing style errors.
2020-08-11 10:42:27 +00:00
John Botella
47e664df8d
Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates
2020-08-11 12:28:40 +02:00
Juanjo Menent
3eb23d3325
FIX: MySql Strict mode
2020-08-11 10:12:19 +02:00
Juanjo Menent
4e6b7289f2
FIX: MySql Strict mode
2020-08-11 10:07:38 +02:00
Juanjo Menent
b1735b0f80
FIX: MySql Strict mode
2020-08-11 10:02:46 +02:00
jove@bisquerra.com
3be723f3a1
NEW: Delayed payment in TakePOS
2020-08-11 07:49:54 +02:00
josemariagomezroncero
308dea92b3
Bug, this option disable topic input.
...
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
2020-08-10 20:40:11 +02:00
stickler-ci
3e168f9495
Fixing style errors.
2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894
set default unit to PRODUCT_USE_UNITS value
2020-08-10 15:39:05 +02:00
florian HENRY
c4d8a25c5a
fix external module multidiroutput
2020-08-10 13:40:55 +02:00
John Botella
f014365b65
Fix lang fr
2020-08-10 10:35:50 +02:00
Ferran Marcet
10df9777b5
FIX: Visualization rights correction on last modified contacts box
2020-08-10 09:53:20 +02:00
Cédric
3f233a3200
Fix comment params
2020-08-08 23:01:41 +02:00
stickler-ci
d7a65a540e
Fixing style errors.
2020-08-08 20:58:51 +00:00
Cédric
9b00a1f61a
Some updates for attributes triggers
2020-08-08 22:48:21 +02:00
Cédric
ed1a2cd917
Update 1
2020-08-08 22:45:51 +02:00
Cédric
ef57bb7e84
pass $user to delete functions
2020-08-08 22:14:53 +02:00
Cédric
e73a7c78f7
NEW triggers create, modify, delete
2020-08-08 22:10:50 +02:00
Cédric
bb16564b98
NEW triggers create, modify, delete
...
Also modified deleteByFkAttribute() to use the function delete()
2020-08-08 22:08:46 +02:00
Philippe Grand
e7bea7c5ce
Update pdf_cyan.modules.php
2020-08-08 15:34:38 +02:00
Philippe GRAND
fe24c2f8b8
fix undefined variable
2020-08-08 15:29:53 +02:00
Philippe GRAND
f35893ceb4
fix deprecated
2020-08-08 15:12:29 +02:00
Philippe GRAND
0603a3ef60
fix conflict
2020-08-08 15:00:13 +02:00
Philippe GRAND
d811934962
fix conflict
2020-08-08 14:57:43 +02:00
Laurent Destailleur
a53f7ff9c9
Merge pull request #14428 from asolslk/patch-3
...
Fix group by finance account error #14221
2020-08-08 13:33:10 +02:00
Laurent Destailleur
cab9f6daae
Comment must be in english
2020-08-08 13:22:55 +02:00
Laurent Destailleur
a32587d993
Merge pull request #14420 from egils-consulting/patch-5
...
New function count_all_categories
2020-08-08 13:16:12 +02:00
Laurent Destailleur
f8557879fb
Update listbyaccount.php
2020-08-08 13:15:29 +02:00
asolslk
41bb83f107
Update listbyaccount.php
...
fixed #14221
2020-08-08 19:10:50 +08:00
asolslk
ea829913b0
Update accounting.lib.php
2020-08-08 19:07:55 +08:00
stickler-ci
d3cb704a0e
Fixing style errors.
2020-08-08 11:05:19 +00:00
asolslk
5291746252
Update listbyaccount.php
...
fixed #14408
2020-08-08 19:04:38 +08:00
Laurent Destailleur
6e01ffd5ac
Prepare for 12.0.3
2020-08-08 13:00:57 +02:00
Laurent Destailleur
4e6158d23c
Work on recruitment module
2020-08-08 02:54:14 +02:00
Laurent Destailleur
deabfcf403
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-08 02:34:36 +02:00
Laurent Destailleur
537b58b446
Introduce workaround to allow integrator to suggest list of modules in
...
old style by default instead of kanban style #14075
2020-08-08 02:34:22 +02:00
Laurent Destailleur
b5749af5b4
Merge pull request #14379 from fappels/12_fix_search_stock_list
...
FIX filter warehouse list on status
2020-08-08 02:25:54 +02:00
Laurent Destailleur
8f8f7ecf5d
Update categorie.class.php
2020-08-08 02:24:01 +02:00
stickler-ci
fc58d92db4
Fixing style errors.
2020-08-07 21:20:55 +00:00
Egils Consulting
9f130aa2af
New function count_all_categories
...
This is useful to count the total number of categories e.g. to decide whether to load the full tree or not. It might make most sense to wait with merging until there is code in viewcat.php or index.php using it.
2020-08-07 23:17:43 +02:00
Laurent Destailleur
6f7b65d9f2
css
2020-08-07 20:44:49 +02:00
Laurent Destailleur
aa699bacc6
css
2020-08-07 20:10:31 +02:00
Laurent Destailleur
4855b49698
css
2020-08-07 19:44:49 +02:00
Laurent Destailleur
030df58fea
Fix regression in sending emails
2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e
Fix regression in sending emails
2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3
Fix regression in sending emails
2020-08-07 17:06:12 +02:00
Laurent Destailleur
e69616110d
Fix permission on page
2020-08-07 16:59:27 +02:00
Laurent Destailleur
0dda5ca4d6
Fix experimental
2020-08-07 16:27:09 +02:00
Laurent Destailleur
9876e37309
A little perf and memory enhancement when building category tree
2020-08-07 15:47:02 +02:00
Laurent Destailleur
00804c1020
Complete fix for #14146
2020-08-07 15:19:26 +02:00
Francis Appels
dec0e418e3
Convert search key status to class key statut.
...
Add comment to refactor class statut to class status
2020-08-07 15:11:36 +02:00
Laurent Destailleur
dd773d33fd
Fix phpcs
2020-08-07 14:57:52 +02:00
Laurent Destailleur
ada7b74ba1
Fix phpcs
2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a
Merge pull request #14355 from fmarcet/10.0
...
Fix: User can see events that are not assigned to it
2020-08-07 14:54:39 +02:00
Laurent Destailleur
7e629d7ef4
FIX Language visible just after login does not match user choice.
2020-08-07 14:39:49 +02:00
Laurent Destailleur
71a6cf1207
Fix permission on type of email templates must depends on user perms.
...
Conflicts:
htdocs/admin/mails_templates.php
2020-08-07 14:39:30 +02:00
Laurent Destailleur
f132f272f2
Fix missing translation
2020-08-07 14:38:42 +02:00
Laurent Destailleur
5e90286a2e
Fix permission on type of email templates must depends on user perms.
2020-08-07 14:38:03 +02:00
Laurent Destailleur
7e15abc972
Fix missing translation
2020-08-07 14:34:21 +02:00
Laurent Destailleur
1bb24de555
Can set the language of a user.
2020-08-07 14:22:43 +02:00
Francis Appels
4376ca4c94
Revert "Fix filter warehouse list on status"
...
This reverts commit 587ca48312
2020-08-07 14:16:49 +02:00
Laurent Destailleur
dd510901a4
Fix duplicate field
2020-08-07 14:05:15 +02:00
Laurent Destailleur
aaaf690006
FIX Language visible just after login does not match user choice.
2020-08-07 14:05:05 +02:00
Laurent Destailleur
e72e05d5f5
Add field default_lang for users
2020-08-07 13:31:23 +02:00
Laurent Destailleur
7128e658cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-07 12:49:33 +02:00
Laurent Destailleur
940b4e7bea
Fix #14413
2020-08-07 12:49:21 +02:00
Laurent Destailleur
47cf447310
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-07 12:10:08 +02:00
Laurent Destailleur
68a3716fd2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/projet/info.php
2020-08-07 12:09:58 +02:00
bahfir abbes
2cdb17a110
fix: fetch reception on supplier order dispatch fetch
2020-08-07 12:08:14 +02:00
Laurent Destailleur
7a03521664
Doc
2020-08-07 12:07:34 +02:00
Laurent Destailleur
e8b5453976
Merge pull request #14387 from bafbes/abb120133
...
fix: fetch reception on supplier order dispatch fetch
2020-08-07 12:07:24 +02:00
Laurent Destailleur
aa422ce4d7
Merge branch 'develop' into develop
2020-08-07 12:05:32 +02:00
Laurent Destailleur
4468c5cfb0
Merge pull request #14412 from egils-consulting/patch-3
...
Update api_products.class.php
2020-08-07 12:03:40 +02:00
Laurent Destailleur
d3b16374fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/class/api_supplier_invoices.class.php
2020-08-07 12:00:52 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
3a7b53cb22
Merge pull request #14386 from egils-consulting/fix-typos-and-clarify-403-error
...
Update api_supplier_invoices.class.php
2020-08-07 11:47:37 +02:00
Laurent Destailleur
ed6acfa1e7
Better compatibility
2020-08-07 11:45:15 +02:00
Egils Consulting
c52c4229c5
Update api_supplier_invoices.class.php
...
fixes #14831
2020-08-07 11:43:04 +02:00
Laurent Destailleur
669660df4c
Merge pull request #14383 from egils-consulting/patch-1
...
Update api_supplier_invoices.class.php
2020-08-07 11:42:42 +02:00
Laurent Destailleur
d8e38201d9
Merge pull request #14378 from grandoc/patch-5
...
Update pdf_crabe.modules.php
2020-08-07 11:42:12 +02:00
Laurent Destailleur
a2e4e2d3b2
Merge pull request #14380 from grandoc/patch-6
...
Update pdf_blochet.class.php
2020-08-07 11:41:44 +02:00
Laurent Destailleur
9320ba1b37
Merge pull request #14376 from grandoc/patch-3
...
Update pdf_rouget.modules.php
2020-08-07 11:41:28 +02:00
Laurent Destailleur
07564166c7
Merge pull request #14375 from grandoc/patch-2
...
Update pdf_merou.modules.php
2020-08-07 10:11:16 +02:00
Laurent Destailleur
84c80e50a0
Merge pull request #14374 from grandoc/patch-1
...
Update pdf_ban.modules.php
2020-08-07 10:10:58 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
...
FIX : JS CRASH - bad usage of moreparam
2020-08-07 10:10:09 +02:00
jove@bisquerra.com
022fb23cee
FIX: Get some taxes in TakePOS
2020-08-07 10:01:11 +02:00
Laurent Destailleur
752143fdfd
Merge pull request #14395 from andreubisquerra/master
...
FIX: TakePOS is not loading some specific customer taxes
2020-08-07 10:00:36 +02:00
Laurent Destailleur
16828b8cec
Merge pull request #14403 from FHenry/12.0
...
fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)
2020-08-07 09:58:49 +02:00
Laurent Destailleur
60fe813d26
Merge pull request #14406 from egils-consulting/patch-2
...
Update api_supplier_orders.class.php
2020-08-07 09:55:05 +02:00
Laurent Destailleur
8b69dd1384
Increase length of default password.
2020-08-07 09:50:15 +02:00
Egils Consulting
9c254159ab
Update api_products.class.php
...
fixes #14309
Throw 400 and add hint to user about using the right endpoint.
2020-08-07 00:06:48 +02:00
Egils Consulting
20ea6d86d8
Update api_supplier_orders.class.php
...
Added example of creating a supplier order
2020-08-06 19:57:31 +02:00
Laurent Destailleur
edd19419ad
Add protection to allow only jpg and png as image file
2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d
Add protection to allow only jpg and png as image file
2020-08-06 17:37:00 +02:00
Laurent Destailleur
c2b03e49e1
Fix logo not visible in setup page
2020-08-06 17:28:57 +02:00
Laurent Destailleur
c6ee80eefd
FIX Disable svg as supported image by default. Set
...
MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.
2020-08-06 17:16:09 +02:00
florian HENRY
46cafcc445
Merge branch '11.0' into 12.0
2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf
Merge branch '10.0' into 11.0
2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd
FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method
2020-08-06 16:28:17 +02:00
Laurent Destailleur
e6c4c8082e
Fix phpcs
2020-08-06 16:10:40 +02:00
Laurent Destailleur
561520b44c
WIP Recruitment module
2020-08-06 16:06:15 +02:00
Laurent Destailleur
43b23994e4
WIP Recruitment module
2020-08-06 15:55:04 +02:00
quentin
215242a4a1
fix right project info.php
2020-08-06 14:11:26 +02:00
Laurent Destailleur
e830e7f3d3
Work on recruitment module
2020-08-06 13:14:43 +02:00
Laurent Destailleur
da59bb811f
Fix backtopage after creating a bookmark
2020-08-06 12:29:57 +02:00
jove@bisquerra.com
25c37d9bca
FIX: Get some taxes in TakePOS
2020-08-06 07:32:28 +02:00
Laurent Destailleur
37f1b27bd2
Fix phpcs
2020-08-06 03:55:47 +02:00
Laurent Destailleur
01babc452c
More logs
2020-08-06 03:52:49 +02:00
Laurent Destailleur
cd89538ee9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-06 03:04:46 +02:00
Laurent Destailleur
5b0d04609c
Fix number to string
2020-08-06 03:03:18 +02:00
Laurent Destailleur
b40177a8c8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 03:00:16 +02:00
Laurent Destailleur
fbcf95ba02
Fix number to string
2020-08-06 02:59:46 +02:00
Laurent Destailleur
641d9a6565
Fix number to string
2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d
Fix function to convert price to string
2020-08-06 02:50:24 +02:00
Laurent Destailleur
d2eb1cc47d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:20:49 +02:00
Laurent Destailleur
12b9a73ca5
Fix phpcs
2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
4785e84c43
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2020-08-06 02:10:17 +02:00
Laurent Destailleur
2fd430bd2c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 02:08:44 +02:00
Laurent Destailleur
ef0f7cfa6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/fourn/paiement/card.php
2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165
FIX Bad address used for vendor on PDF standard of supplier payment
2020-08-06 02:05:55 +02:00
Laurent Destailleur
c8bff3a71e
FIX Cannot redeclare class
2020-08-06 02:05:04 +02:00
Laurent Destailleur
1cf3422e05
FIX Bad adress of vendor in PDF for PDF of supplier payment
...
FIX dol_convertToWord() Bad conversion of number into a string
2020-08-06 01:56:42 +02:00
Laurent Destailleur
8b4e153f81
Doc
2020-08-05 20:05:59 +02:00
Laurent Destailleur
24a9a5ac2d
CSS
2020-08-05 19:42:36 +02:00
Laurent Destailleur
fb5b29a32b
FIX Restore the links on late badge
2020-08-05 19:39:38 +02:00
spooky360
a94fa93973
Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr )
2020-08-05 17:11:19 +02:00
spooky360
b9513255fd
Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr ).
2020-08-05 17:02:59 +02:00
Laurent Destailleur
76624122dd
Fix regression: Restore filter on "alerte"
2020-08-05 16:05:29 +02:00
Laurent Destailleur
1f02b33195
Work on inventory
2020-08-05 12:25:26 +02:00
Laurent Destailleur
0884678264
Look and feel v12
2020-08-05 11:10:38 +02:00
Laurent Destailleur
201c3f87ca
WIP Inventory module
2020-08-05 10:40:43 +02:00
bahfir abbes
6e16a8a544
fix: fetch reception on supplier order dispatch fetch
2020-08-05 08:36:27 +01:00
Egils Consulting
51ab0a5084
Update api_supplier_invoices.class.php
...
fixes #14831
2020-08-04 22:02:15 +02:00
Egils Consulting
a77b343db2
Update api_supplier_invoices.class.php
...
Unified names.
Renamed variable to an english name $paiementid => $payment_mode_id
Added hints where to look up the IDs needed.
2020-08-04 21:58:01 +02:00
Egils Consulting
3a9021f191
Update api_supplier_invoices.class.php
...
Fix order->invoice and clarify 403 error which is always caused by the invoice already being validated.
2020-08-04 21:47:39 +02:00
Laurent Destailleur
0ada919f65
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2020-08-04 21:22:56 +02:00
Laurent Destailleur
04d18e2a68
css
2020-08-04 21:17:13 +02:00
Laurent Destailleur
eefa2bcaba
FIX List of invoice waiting for direct debit
2020-08-04 21:12:28 +02:00
Laurent Destailleur
9d4e672475
FIX Debug direct debit module and credit transfer module
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
a3f7cbd63d
css
2020-08-04 21:07:56 +02:00
Laurent Destailleur
84bdfc4bb7
FIX List of invoice waiting for direct debit
2020-08-04 21:06:38 +02:00
Laurent Destailleur
5189e8beea
FIX Debug direct debit module and credit transfer module
2020-08-04 20:26:57 +02:00
Laurent Destailleur
d8da007e0e
css
2020-08-04 18:50:57 +02:00
Philippe Grand
eed8957e07
Update pdf_blochet.class.php
...
The comment should be TCPDF and not PDF
2020-08-04 17:33:52 +02:00
Francis Appels
587ca48312
Fix filter warehouse list on status
2020-08-04 17:25:35 +02:00
Philippe Grand
8d2edfc5ab
Update pdf_crabe.modules.php
...
The comment should be TCPDF and not PDF
2020-08-04 17:13:08 +02:00
Philippe Grand
8483d4609c
Update pdf_rouget.modules.php
...
The comment should be TCPDF and not PDF
2020-08-04 17:05:32 +02:00
Philippe Grand
7e519da8df
Update pdf_merou.modules.php
...
The comment should be TCPDF and not PDF
2020-08-04 17:00:59 +02:00
Philippe Grand
e368de9bba
Update pdf_ban.modules.php
2020-08-04 16:55:47 +02:00
stickler-ci
8d88217434
Fixing style errors.
2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0
Fix: User can see events that are not assigned to it
2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99
Fix: User can see events that are not assigned to it
2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86
Merge remote-tracking branch 'origin/10.0' into 10.0
2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8
Merge branch '10.0up' into 10.0
2020-08-04 16:39:40 +02:00
Philippe Grand
bc86518020
Update pdf_aurore.modules.php
2020-08-04 16:13:35 +02:00
Philippe Grand
6a24aed42a
Update pdf_standard.modules.php
2020-08-04 16:12:21 +02:00
Philippe Grand
c6b4c4392c
Update pdf_muscadet.modules.php
2020-08-04 16:11:25 +02:00
Philippe Grand
79be00f0aa
Update pdf_cornas.modules.php
2020-08-04 16:10:06 +02:00
Philippe Grand
62c49b2ce3
Update pdf_canelle.modules.php
2020-08-04 16:08:43 +02:00
Philippe Grand
49c99cfa70
Update pdf_squille.modules.php
2020-08-04 16:07:21 +02:00
Philippe Grand
4d1743ffcf
Update pdf_cyan.modules.php
2020-08-04 16:06:01 +02:00
Philippe Grand
f4a4444c79
Update pdf_azur.modules.php
2020-08-04 16:04:54 +02:00
Philippe Grand
54878e2916
Update pdf_timespent.modules.php
2020-08-04 16:03:28 +02:00
Philippe Grand
d9c260c7f1
Update pdf_beluga.modules.php
2020-08-04 16:02:19 +02:00
Philippe Grand
81b484ecc8
Update pdf_baleine.modules.php
2020-08-04 16:01:28 +02:00
Philippe Grand
d781a7cf62
Update pdf_espadon.modules.php
2020-08-04 16:00:12 +02:00
Philippe Grand
e8f92fe5bc
Update pdf_standard.class.php
2020-08-04 15:59:23 +02:00
Philippe Grand
6937efa3ba
Update pdf_typhon.modules.php
2020-08-04 15:57:25 +02:00
Philippe Grand
ea72d5dc82
Update pdf_soleil.modules.php
2020-08-04 15:56:17 +02:00
Philippe Grand
51cbbcd3b8
Update pdf_sponge.modules.php
2020-08-04 15:55:14 +02:00
Philippe Grand
d97a9c9b0d
Update pdf_crabe.modules.php
2020-08-04 15:53:20 +02:00
Philippe Grand
85879a0baa
Update pdf_standard.modules.php
2020-08-04 15:51:35 +02:00
Philippe Grand
001662af3d
Update pdf_rouget.modules.php
2020-08-04 15:49:47 +02:00
Philippe Grand
19fb6e827e
Update pdf_merou.modules.php
2020-08-04 15:47:00 +02:00
Philippe Grand
f94d4413a9
Update pdf_espadon.modules.php
2020-08-04 15:45:52 +02:00
Philippe Grand
3fcacf7196
Update pdf_blochet.class.php
2020-08-04 15:44:25 +02:00
Philippe Grand
2627bec686
Update pdf_sepamandate.modules.php
2020-08-04 15:43:28 +02:00
Philippe Grand
6874feb09a
Update pdf_ban.modules.php
2020-08-04 15:42:14 +02:00
Philippe Grand
e4faa0228e
Update pdf_strato.modules.php
2020-08-04 15:40:42 +02:00
Laurent Destailleur
cb0a9868d7
Space
2020-08-04 15:16:11 +02:00
Laurent Destailleur
07f420d58e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
2020-08-04 15:03:51 +02:00
Laurent Destailleur
5d20f47473
FIX page for confirmation of payments is empty
2020-08-04 15:00:03 +02:00
Laurent Destailleur
e16fd45972
FIX Label of opportunities in graph with special chars badly encoded
2020-08-04 14:44:52 +02:00
John Botella
11f14b8fe5
Fix bad usage of moreparam
2020-08-04 14:13:52 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
9a5d0ab0a2
FIX #14236
2020-08-04 13:48:11 +02:00
Laurent Destailleur
30560397e4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2020-08-04 13:43:00 +02:00
Laurent Destailleur
241a97fd19
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-04 13:41:26 +02:00
Laurent Destailleur
83a9be2428
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-08-04 13:41:19 +02:00
Laurent Destailleur
39a5583930
FIX #14146
2020-08-04 13:32:26 +02:00
Laurent Destailleur
bd8e8a4087
Merge pull request #14351 from atm-quentin/FIX_product_label_desc_update
...
FIX product label and desc were never updated when modifying trans
2020-08-04 13:07:41 +02:00
Laurent Destailleur
f11accf4c2
Merge pull request #14359 from atm-quentin/FIX_missing_conf_on_supplier_order
...
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
2020-08-04 12:48:39 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Laurent Destailleur
c09827248b
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default
...
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
2020-08-04 12:27:31 +02:00
Laurent Destailleur
08167b959c
Update actions_addupdatedelete.inc.php
2020-08-04 12:21:38 +02:00
Laurent Destailleur
2aaae47aef
Update actions_addupdatedelete.inc.php
2020-08-04 12:21:32 +02:00
bahfir abbes
13202dfc7c
fix:value of checked option must be the same as in showInputfield function
2020-08-04 12:21:25 +02:00
Laurent Destailleur
2fd59fd0c9
Merge pull request #14362 from bafbes/abb120129
...
fix:value of checked option must be the same as in showInputfield function
2020-08-04 12:20:38 +02:00
Laurent Destailleur
0d17682773
Update actions_addupdatedelete.inc.php
2020-08-04 12:20:10 +02:00
Laurent Destailleur
fa96fd8a8b
Update actions_addupdatedelete.inc.php
2020-08-04 12:19:44 +02:00
Laurent Destailleur
cc88fe9b68
Merge pull request #14365 from bafbes/abb120131
...
NEW Add link to reset qty on supplier dispatch page
2020-08-04 12:00:47 +02:00
Laurent Destailleur
4bacb7d48e
Update dispatch.php
2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb
Update dispatch.php
2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba
Update dispatch.php
2020-08-04 11:56:01 +02:00
Laurent Destailleur
615995476b
Merge pull request #14367 from andreubisquerra/master
...
Improve TakePOS search on click ENTER
2020-08-04 11:52:36 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Laurent Destailleur
96581ef1f4
Merge pull request #14370 from fappels/12_fix_search_stock_list
...
FIX search warehouse list
2020-08-04 11:49:20 +02:00
Francis Appels
81467e1d09
FIX search warehouse list
2020-08-04 11:05:12 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
andreubisquerra
0347f2a46b
More elegant
2020-08-04 08:19:27 +02:00
jove@bisquerra.com
6d957c276c
Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan
2020-08-04 08:11:44 +02:00
Laurent Destailleur
bf1f295602
NEW Can disable, from edit page, the whole web site
...
FIX position of a cloned website
2020-08-04 02:50:56 +02:00
Laurent Destailleur
063b63d348
Fix phpcs
2020-08-04 00:36:45 +02:00
Bahfir Abbes
8dd54e24e7
empty is more useful than 0
2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8
fix: reset link on supplier dispatch
2020-08-03 20:31:55 +01:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
bahfir abbes
e24027fb1e
fix: restore autofill lost functionality
2020-08-03 18:44:36 +01:00
Laurent Destailleur
22f69f0da9
CSS
2020-08-03 17:39:18 +02:00
Laurent Destailleur
c78b19b3b8
Move module as experimental (it is working enough).
2020-08-03 16:39:52 +02:00
Laurent Destailleur
d5237e6fda
css
2020-08-03 16:36:31 +02:00
Laurent Destailleur
fa26d2acdf
css
2020-08-03 16:31:52 +02:00
bahfir abbes
15a634959f
fix:value of checked option must be the same as in showInputfield function
2020-08-03 14:32:57 +01:00
Laurent Destailleur
aa696d8343
Show warning in kanban view
2020-08-03 15:17:37 +02:00
VERDOL Gauthier
2d192431bc
FIX : wrong element var for fetch_name_optionals_label function with expeditions
2020-08-03 14:59:51 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921
FIX Size of image on the help popup of modules
2020-08-03 14:32:42 +02:00
Laurent Destailleur
d1f92fb66b
NEW: Add module Credit transfer SEPA to manage payment of supplier using
...
bank credit transfer SEPA files
2020-08-03 14:15:14 +02:00
Laurent Destailleur
8c34acbf55
FIX Warning if no bank account defined
2020-08-03 14:11:15 +02:00
Laurent Destailleur
defbd26f95
Help to fight errors ErrorBadValueForParamNotAString
2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0
FIX input field of extrafields must keep data if form submit fails.
2020-08-03 12:31:30 +02:00
Florian Mortgat
ce18a4f029
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
2020-08-03 12:28:12 +02:00
Laurent Destailleur
576363f353
Fix error message
2020-08-03 12:26:26 +02:00
Laurent Destailleur
d59bcd3f5b
FFIX error creating record when extrafields price exists in other entity
2020-08-03 12:08:33 +02:00
quentin
bbfca90260
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
2020-08-03 11:54:26 +02:00
Laurent Destailleur
55f3a8b4f8
Fix col size too large by migrating to dynamic format on tables
2020-08-03 11:37:55 +02:00
stickler-ci
9926eac192
Fixing style errors.
2020-08-03 09:26:36 +00:00
Laurent Destailleur
e64b8eaf40
Fix debug credit transfer module
2020-08-03 11:21:13 +02:00
quentin
72b2fb442b
fix test libelle
2020-08-03 11:17:39 +02:00
Ferran Marcet
63b15dd1b6
Fix: User can see events that are not assigned to it
2020-08-03 11:17:30 +02:00
quentin
b026896a98
FIX product label and desc were never updated when modifying trans
2020-08-03 10:33:48 +02:00
Philippe GRAND
42fcb64700
Change comment to fixe a lot of undefined method
2020-08-03 10:26:01 +02:00
Philippe GRAND
85b2adaaec
Change comment to fixe a lot of undefined method
2020-08-03 10:13:18 +02:00
Philippe GRAND
0d6274c8fe
Change comment to fixe a lot of undefined method
2020-08-03 10:04:54 +02:00
Philippe GRAND
d6c84ef5ce
Change comment to fixe a lot of undefined method
2020-08-03 10:02:25 +02:00
Philippe GRAND
6fa3e8df4e
Change comment to fixe a lot of undefined method
2020-08-03 10:00:20 +02:00
Philippe GRAND
3a2e527454
Change comment to fixe a lot of undefined method
2020-08-03 09:58:47 +02:00
Philippe GRAND
1ea21ee1b8
Change comment to fixe a lot of undefined method
2020-08-03 09:56:48 +02:00
Philippe GRAND
d446a38b34
Change comment to fixe a lot of undefined method
2020-08-03 09:54:19 +02:00
Philippe GRAND
9fd520b5d4
Change comment to fixe a lot of undefined method
2020-08-03 09:52:11 +02:00
Laurent Destailleur
679625daee
Trans
2020-08-03 09:51:15 +02:00
Philippe GRAND
3b80e9a08e
Change comment to fixe a lot of undefined method
2020-08-03 09:50:30 +02:00
Philippe GRAND
8ff27f89e5
Change comment to fixe a lot of undefined method
2020-08-03 09:48:25 +02:00
Philippe GRAND
703de5286f
Change comment to fixe a lot of undefined method
2020-08-03 09:46:07 +02:00
Philippe GRAND
ed6d83687c
Change comment to fixe a lot of undefined method
2020-08-03 09:44:44 +02:00
Philippe GRAND
2c4d8bceb6
Change comment to fixe a lot of undefined method
2020-08-03 09:39:54 +02:00
Philippe GRAND
c7bf47a00b
Change comment to fixe a lot of undefined method
2020-08-03 09:38:05 +02:00
Philippe GRAND
857505a887
Change comment to fixe a lot of undefined method
2020-08-03 09:36:23 +02:00
Philippe GRAND
0e0adcbe43
Change comment to fixe a lot of undefined method
2020-08-03 09:33:19 +02:00
Philippe GRAND
38f4e0392d
Change comment to fixe a lot of undefined method
2020-08-03 09:30:31 +02:00
Philippe GRAND
8bdf15a6a6
Change comment to fixe a lot of undefined method
2020-08-03 09:28:25 +02:00
Philippe GRAND
83d1ff2a6c
Change comment to fixe a lot of undefined method
2020-08-03 09:25:17 +02:00
Philippe GRAND
0b75280104
Change comment to fixe a lot of undefined method
2020-08-03 09:19:55 +02:00
Philippe GRAND
ccb9d62a14
Change comment to fixe a lot of undefined method
2020-08-03 09:13:46 +02:00
Laurent Destailleur
805ad6f5fe
Several fixes
2020-08-02 22:44:37 +02:00
Laurent Destailleur
4afdfdda53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694
Fix phpcs
2020-08-02 22:40:17 +02:00
Laurent Destailleur
66d4b7372e
FIX Look and feel v12
...
Conflicts:
htdocs/comm/card.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2020-08-02 22:38:20 +02:00
Laurent Destailleur
87f71e7681
FIX Look and feel v12
2020-08-02 22:36:14 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
a51829d03c
CSS
2020-08-02 18:50:08 +02:00
Laurent Destailleur
aca20c89f9
Can use a generic email for recruitment
2020-08-02 18:45:42 +02:00
Laurent Destailleur
a300eae994
Sync transifex
2020-08-02 18:33:15 +02:00
Laurent Destailleur
d054aedc80
Sync language
2020-08-02 18:32:54 +02:00
Laurent Destailleur
04903460b1
Add contact on job page
2020-08-02 18:09:53 +02:00
Laurent Destailleur
7149cbb532
NEW Add public note on products. This also partially fix the #14342
2020-08-02 17:09:21 +02:00
Laurent Destailleur
7239232528
Add total
2020-08-02 16:28:59 +02:00
Laurent Destailleur
d685aec482
css
2020-08-02 16:19:34 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-08-02 16:01:03 +02:00
Laurent Destailleur
08ff08fb86
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-02 15:53:48 +02:00
Laurent Destailleur
367914015c
NEW Add a counter of number of words of pages in website module
2020-08-02 15:53:34 +02:00
jove@bisquerra.com
593c7242c4
NEW: TakePOS Gift Receipt
2020-08-02 11:13:41 +02:00
Laurent Destailleur
608656ae89
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 01:35:15 +02:00
Laurent Destailleur
9aa9852e85
Fix perms
2020-08-02 01:35:03 +02:00
Laurent Destailleur
ebe2e8ea04
Merge pull request #14319 from aspangaro/13a3
...
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-08-02 01:33:39 +02:00
Laurent Destailleur
8c4b4e233d
Merge pull request #14317 from fappels/12_show_virtual_stock
...
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2020-08-02 01:32:18 +02:00
Laurent Destailleur
32d2dd71e2
Merge pull request #14324 from FHenry/dev_add_ProductHook
...
NEW add formConfirm hook on product page
2020-08-02 01:29:33 +02:00
Laurent Destailleur
d44a16bdfa
Merge pull request #14327 from FHenry/dev_refac_classproduct
...
->error rather than dol_print_error into product class
2020-08-02 01:21:19 +02:00
Laurent Destailleur
75d8455789
Merge pull request #14328 from marc-dll/NEW_api_thirdparty_price_level
...
NEW: thirdparty REST API: endpoint to set price level
2020-08-02 01:20:05 +02:00
Laurent Destailleur
4886dd2854
Merge pull request #14333 from bafbes/abb110227
...
fix:erroneous input id name
2020-08-02 01:19:03 +02:00
Laurent Destailleur
817912ea40
FIX #14291
2020-08-02 01:11:23 +02:00
Laurent Destailleur
728460fa1b
Look and feel v13
2020-08-02 01:01:40 +02:00
Laurent Destailleur
328a25abea
FIX Bad back to link
2020-08-02 00:59:53 +02:00
Laurent Destailleur
34cbdaf2ff
Look and feel v13
2020-08-02 00:52:01 +02:00
Laurent Destailleur
8aa968a27c
NEW Can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
2020-08-02 00:41:26 +02:00
Laurent Destailleur
d08c42a205
CSS Better visibility for buttons and status
2020-08-02 00:15:21 +02:00
Laurent Destailleur
3bfd7644a4
Fix return link
2020-08-01 20:17:49 +02:00
bahfir abbes
6d3cebfa3c
fix:erroneous input id name
2020-08-01 12:54:42 +01:00
Marc DLL
5087d35f86
NEW: thirdparty REST API: endpoint to set price level
2020-07-31 17:48:44 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
florian HENRY
e44a1fd33f
->error rather than dol_print_error into product
2020-07-31 16:09:38 +02:00
florian HENRY
164e3bff2c
add formConfirm hook
2020-07-31 15:23:26 +02:00
Laurent Destailleur
0b46fcb4f8
Debug
2020-07-31 14:02:08 +02:00
Laurent Destailleur
0d71cd4279
Fix td not closed
2020-07-31 13:51:49 +02:00
Laurent Destailleur
f80b54e573
Debug setup of receipt printer module
2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db
FIX Debug setup of receipt printer module
2020-07-31 13:40:36 +02:00
Laurent Destailleur
255dc71823
Missing translation
2020-07-31 13:20:05 +02:00
altairis
448cd1cd36
Merge branch '10.0' into fixsizewithff
2020-07-31 12:23:57 +02:00
altairis
9a9eef428b
fix duration fields size with firefox
2020-07-31 12:22:21 +02:00
Alexandre SPANGARO
d1560c3e75
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-07-30 21:10:06 +02:00
Laurent Destailleur
f5d7e94d7e
NEW Add a stat page to list popularity of products on invoices
...
Merge duplicate pages into 1.
2020-07-30 19:32:06 +02:00
Laurent Destailleur
e7fedd5c2d
FIX Sql error on stat by referring entries of a product
2020-07-30 19:14:40 +02:00
Laurent Destailleur
0bf678e09e
Fix label of extrafields
2020-07-30 14:57:33 +02:00
Laurent Destailleur
618c85ceb1
FIX Filter too large for extrafields with type text or html
2020-07-30 14:49:31 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Laurent Destailleur
05531f95d6
Fix phpcs
2020-07-30 14:03:01 +02:00
Laurent Destailleur
2ff6791e53
css
2020-07-30 04:23:23 +02:00
Laurent Destailleur
4ed1da1632
Work on recruitment module
2020-07-30 04:17:05 +02:00
Laurent Destailleur
f937f5beea
Work on recruitment module
2020-07-30 04:06:27 +02:00
Laurent Destailleur
c79d617a50
Add public page of job position offers
2020-07-30 03:50:27 +02:00
Francis Appels
54410189bc
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
...
When product ajax search used a dash is show, so virtual stock looks like being negative value.
2020-07-29 17:00:39 +02:00
Laurent Destailleur
d08b3513dc
Merge pull request #14247 from FHenry/11.0_fix_commerce_MenuSupplierORderOnly
...
fix display Commerce top menu user only supplier order rights and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-29 14:27:14 +02:00
Laurent Destailleur
6a5427ee4f
Merge pull request #14274 from atm-quentin/FIX_null_required
...
FIX null required
2020-07-29 14:13:53 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php
2020-07-29 14:13:29 +02:00
Laurent Destailleur
3e586d3b26
Merge pull request #14285 from RomainDeschamps/patch-7
...
NEW add costprice in fields of products list
2020-07-29 13:57:17 +02:00
Laurent Destailleur
2c12a761ee
Merge pull request #14283 from atm-john/11.0_fix_mysql_update
...
Fix MySQL rank usage for column
2020-07-29 13:56:20 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
ab4b1b1f29
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f
Fix regression
2020-07-29 13:47:04 +02:00
Laurent Destailleur
c93a4c7fc0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:27 +02:00
Laurent Destailleur
566f683c54
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:19 +02:00
Romain DESCHAMPS
eaef99b7af
second approval back in stable feature as is the setting for minimum amount
2020-07-29 13:39:38 +02:00
Laurent Destailleur
9e85abc8c1
Merge pull request #14286 from RomainDeschamps/patch-1
...
second approval back in stable feature as is the setting for minimum …
2020-07-29 13:38:58 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags
...
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
2020-07-29 13:34:45 +02:00
Laurent Destailleur
9bef1ef6dd
Merge pull request #14298 from bafbes/abb110230
...
fetch product model_pdf field
2020-07-29 13:19:09 +02:00
Laurent Destailleur
1d686a0d4c
Update product.class.php
2020-07-29 13:18:49 +02:00
Laurent Destailleur
0928a5843b
Merge pull request #14300 from bafbes/abb110232
...
fix:fetch and update model_pdf attribute for societe
2020-07-29 13:11:51 +02:00
Laurent Destailleur
377e331e6a
Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset
...
FIX 11.0: DebugBar hides content at page bottom
2020-07-29 13:10:56 +02:00
Laurent Destailleur
af177f2833
Update reassort.php
2020-07-29 13:07:02 +02:00
Laurent Destailleur
d1cb7d447f
Merge branch 'develop' into FIX_10.0_reassort_hooks
2020-07-29 13:05:12 +02:00
AXeL
3c6eb5e0e2
Add missing "Default values" menu entry to auguria menu
2020-07-29 13:02:11 +02:00
Laurent Destailleur
a0d3fd5756
Merge pull request #14289 from AXeL-dev/patch-12
...
Add missing "Default values" menu entry to auguria menu
2020-07-29 13:01:43 +02:00
Laurent Destailleur
d9191c74d8
Update fournisseur.commande.class.php
2020-07-29 12:59:59 +02:00
Laurent Destailleur
cb8c8a1d50
Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create
...
FIX: shipping creation: checks not done on weight and sizes
2020-07-29 12:59:23 +02:00
Laurent Destailleur
d2e730f8e5
Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by
...
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
2020-07-29 12:58:28 +02:00
Tim Otte
85c5f423b1
Added fetch_thirdparty (without the site crashes)
2020-07-29 12:55:58 +02:00
Laurent Destailleur
391fcc799b
FIX #14279
2020-07-29 12:51:18 +02:00
Laurent Destailleur
44cfb77622
FIX #14292
2020-07-29 12:43:53 +02:00
Laurent Destailleur
41483df689
FIX #14076
2020-07-29 12:31:03 +02:00
lvessiller
8ee5b16e89
FIX redirect on contact card from main search
2020-07-29 12:00:22 +02:00
VERDOL Gauthier
d214dbb5fd
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
2020-07-28 15:42:54 +02:00
atm-lena
b480fb2dfc
Delete double line
2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1
fetch() command fourn : Same management as commande.class.php of entity
2020-07-28 15:13:56 +02:00
Tim Otte
c5816478d9
Added fetch_thirdparty (without the site crashes)
2020-07-28 11:14:55 +02:00
Laurent Destailleur
81cb5501bc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e
FIX Checkbox "drop table" was not checked when using php method for dump
2020-07-28 10:23:09 +02:00
Laurent Destailleur
364fb05ed3
Fix phpcs
2020-07-28 09:46:31 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
98064f7329
FIX Bad param
2020-07-28 03:02:38 +02:00
Laurent Destailleur
fef180cf86
Fix scrutinizer errors
2020-07-28 02:54:37 +02:00
Laurent Destailleur
8c425ae796
FIX Bad param
2020-07-28 02:47:46 +02:00
Marc DLL
a4427bd2d2
FIX: product stock/reassort list: add hooks
2020-07-27 23:58:06 +02:00
Marc DLL
ee55b82a8d
FIX: shipping creation: checks not done on weight and sizes
2020-07-27 23:27:44 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
abb
5aa4e2353a
fix:fetch and update model_pdf attribute for societe
2020-07-27 15:40:25 +01:00
VERDOL Gauthier
25994e61bc
FIX : We need to see unit line on PDF even though it's an option
2020-07-27 16:04:21 +02:00
abb
ad85671265
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-07-27 13:48:12 +01:00
Laurent Destailleur
6d8060bc50
FIX DO not erase variable $key and $label during output of extrafields
...
Conflicts:
htdocs/core/tpl/extrafields_view.tpl.php
2020-07-27 14:22:55 +02:00
Laurent Destailleur
b93f60c446
Look and feel v13
2020-07-27 14:19:50 +02:00
Laurent Destailleur
10484ba06e
FIX DO not erase variable $key and $label during output of extrafields
2020-07-27 14:04:41 +02:00
Laurent Destailleur
988e9e5817
Update to jquery 3.5.1
2020-07-27 13:52:19 +02:00
abb
fd6477c054
fetch product model_pdf field
2020-07-27 10:57:39 +01:00
Laurent Destailleur
19b550009b
Trans
2020-07-27 02:38:31 +02:00
Laurent Destailleur
9798bb1b30
Fix responsive
2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7
Fix responsive
2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:25:09 +02:00
Laurent Destailleur
26c253113b
Removed not used files
2020-07-26 22:04:19 +02:00
Laurent Destailleur
cef996926e
WIP Add publilc interface for recruitment
2020-07-26 22:03:40 +02:00
Laurent Destailleur
01adf73e53
WIP Add publilc interface for recruitment
2020-07-26 22:02:49 +02:00
Laurent Destailleur
714481f7e5
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8
FIX Navigation in object fails to find the next ref in some cases
2020-07-26 21:07:39 +02:00
Laurent Destailleur
d945ef67e1
FIX Picto of HRM module
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4
FIX Picto of HRM module
2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
f847cad197
Fix perm
2020-07-26 20:02:29 +02:00
Laurent Destailleur
12bb44ed03
Fix recruitment
2020-07-26 19:57:42 +02:00
Laurent Destailleur
4fadd747ae
Trans
2020-07-26 19:53:51 +02:00
Laurent Destailleur
353e99c26a
Fix look and feel
2020-07-26 19:43:55 +02:00
Laurent Destailleur
cdf7261c7e
Fix look and feel
2020-07-26 19:27:29 +02:00
Laurent Destailleur
378c45fe5c
Fix look and feel
2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d
Look and feel
2020-07-26 18:34:50 +02:00
Laurent Destailleur
b93cab2e77
css
2020-07-26 00:04:10 +02:00
Laurent Destailleur
e33722750c
Fix option THEME_SHOW_BORDER_ON_INPUT
2020-07-25 19:05:52 +02:00
AXeL
28fb57d8d6
Add missing "Default values" menu entry to auguria menu
2020-07-25 14:07:44 +01:00
Laurent Destailleur
52f238a351
Fix label
2020-07-25 14:50:09 +02:00
Laurent Destailleur
2d45fd04fe
Doc
2020-07-25 14:47:43 +02:00
FlorianMortgat
93348630bf
FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet
2020-07-25 11:05:05 +02:00
Laurent Destailleur
dd86c21382
FIX dolGetElementUrl and agenda page for external modules
2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b
FIX: allow more harmless html tags
2020-07-25 00:57:40 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
Laurent Destailleur
3ed4773d7f
Fix tab popup when there is 2 head tabs in same page
2020-07-24 18:31:14 +02:00
Laurent Destailleur
b82b6736d1
Look and feel
2020-07-24 18:13:01 +02:00
Laurent Destailleur
6d4b113c72
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 14:25:59 +02:00
Romain DESCHAMPS
09bf8bea85
second approval back in stable feature as is the setting for minimum amount
2020-07-24 14:11:42 +02:00
Laurent Destailleur
d6f1a897f6
Fix size of module box
2020-07-24 13:44:32 +02:00
stickler-ci
fd34908c17
Fixing style errors.
2020-07-24 11:42:18 +00:00
Romain DESCHAMPS
c370241afd
add costprice in fields of the list
2020-07-24 13:40:06 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve
...
Improve printStdColumnContent by passing the $pdf object
2020-07-24 13:20:03 +02:00
Laurent Destailleur
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log
...
FIX: date in supplier price log tooltip.
2020-07-24 13:18:36 +02:00
Laurent Destailleur
4e4e737ff2
Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link
...
FIX : wrong link to third invoice templates
2020-07-24 13:13:15 +02:00
Laurent Destailleur
fb1c226e56
Init var
2020-07-24 13:05:19 +02:00
Laurent Destailleur
ff4ec934e9
Merge pull request #14277 from atm-quentin/fix_warning_total
...
FIX warning
2020-07-24 12:55:24 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php
2020-07-24 12:55:12 +02:00
Laurent Destailleur
c699d71abc
Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied
...
Fix multicurecy option not applied
2020-07-24 12:54:27 +02:00
Laurent Destailleur
93fea8591c
Fix phpcs
2020-07-24 12:17:02 +02:00
Laurent Destailleur
68c23fdadf
Fix phpcs
2020-07-24 12:15:25 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1
FIX dolGetElementUrl and agenda page for external modules
2020-07-24 11:53:44 +02:00
stickler-ci
8273dbcd49
Fixing style errors.
2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php
2020-07-24 10:37:19 +02:00
Laurent Destailleur
195ad9e5fb
Fix exclude .back files
2020-07-24 10:21:20 +02:00
Laurent Destailleur
f50fc751ab
Trans
2020-07-24 10:02:24 +02:00
Laurent Destailleur
ce3248ab57
Trans
2020-07-24 10:01:05 +02:00
Laurent Destailleur
3109d9c16a
Look and feel v13
2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab
Trans
2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3
NEW Can change size of logo on PDF documents
2020-07-24 03:36:44 +02:00
Laurent Destailleur
cf89e159bd
Typo
2020-07-24 03:19:37 +02:00
Laurent Destailleur
fa29549976
Fix trans
2020-07-24 03:09:31 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
e0d22b739d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/stock/class/entrepot.class.php
2020-07-24 01:53:24 +02:00
Laurent Destailleur
db9fc264d9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-24 01:51:20 +02:00
Laurent Destailleur
34a9eee7a6
Minor fix in translation
2020-07-24 01:50:57 +02:00
Laurent Destailleur
0f4e00a2a3
Fix language
2020-07-24 01:43:03 +02:00
Laurent Destailleur
99935ce11f
FIX Should not be able to edit qty on shipment when no stock available
2020-07-24 01:31:07 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
Laurent Destailleur
a46f4df147
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70
FIX ClickToDial tab of users has disappeared
2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d
FIX Can go on page even when module disabled
2020-07-23 23:57:12 +02:00
ATM john
921e904acc
Fix MySQL rank usage for column
2020-07-23 20:34:11 +02:00
John Botella
55e65bbabf
Fix variable init
2020-07-23 11:12:04 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
quentin
7bc683b234
FIX warning
2020-07-22 15:13:50 +02:00
quentin
255bd6b26c
FIX null required
2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php
...
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3
FIX : wrong link to third invoice templates
2020-07-20 16:22:48 +02:00
florian HENRY
734a6de996
Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly
2020-07-20 09:01:30 +02:00
florian HENRY
2c5e96bb28
better fix
2020-07-20 09:01:21 +02:00
Laurent Destailleur
9a506ff9b3
css
2020-07-20 03:29:22 +02:00
Laurent Destailleur
d823bb73c0
Change order of fields for mass stock movement
2020-07-20 01:01:40 +02:00
Laurent Destailleur
9d9f865f37
fetch_optionals must be included into a fetch
2020-07-20 00:24:14 +02:00
Laurent Dinclaux
3cdabbaaff
Explicitly pass the pdf object by reference in the printStdColumnContent hook call.
2020-07-19 21:53:06 +11:00
Francis Appels
c2030a7db5
jdate already in function listProductFournisseurPriceLog
...
So no conversion needed.
2020-07-19 09:43:15 +02:00
Laurent Destailleur
e5688e2641
Fix phpcs
2020-07-19 02:54:25 +02:00
Laurent Destailleur
87cd4b11bd
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154
...
NEW : add class for ticket edition (pdf or odt)
2020-07-19 02:11:13 +02:00
Laurent Destailleur
e17fbf9dcd
Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card
...
NEW Show label on batch card
2020-07-19 02:03:46 +02:00
Laurent Destailleur
3c3be1b04f
Merge pull request #14188 from aspangaro/13a1
...
NEW: Add column quantity in product margin page
2020-07-19 02:02:30 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
...
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
521c4679d9
FIX #14241 Mysql 8 compatibility
2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88
FIX If using a rounding step, localtax1+2 not included in total
2020-07-19 01:47:17 +02:00
Laurent Destailleur
48adeb9dd7
FIX #14256
2020-07-19 01:38:38 +02:00
Laurent Destailleur
6fdd5ea73a
Not required
2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384
FIX #14259
2020-07-19 01:29:42 +02:00
Laurent Destailleur
16d486e211
FIX Setup of currency limit and accuracy
2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4
Code comment
2020-07-19 00:02:02 +02:00
Laurent Destailleur
3069eaa5c0
Merge pull request #14191 from Gecka-Apps/12.0-fix-14181
...
[REGRESSION] Fix #14181 . Limits and accuracy form not saving modified values.
2020-07-18 23:59:29 +02:00
Laurent Destailleur
1f52d99726
Merge pull request #14211 from bb2a/add_zip_town_on_SEARCH_THIRDPARTY
...
Add zip town on search thirdparty
2020-07-18 23:58:36 +02:00
Laurent Destailleur
31cb57afc9
Fix regression with ecoterm
2020-07-18 23:27:43 +02:00
Laurent Destailleur
c30491284f
Fix phpcs
2020-07-18 23:16:05 +02:00
Laurent Destailleur
52fd424812
Merge pull request #14226 from cfoellmann/thirdparty-leftmenu
...
Thirdparty leftmenu
2020-07-18 23:13:40 +02:00
Abdessalam@MEGALOGI
1e6273b92d
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Laurent Destailleur
090d913017
Merge pull request #14248 from megalogi/patch-1
...
FIX Lose HTML tags when adding a new product/service into a document
2020-07-18 23:10:33 +02:00
Laurent Destailleur
3bfa86c52d
Merge pull request #14251 from fmarcet/develop
...
New: ##12972 Update supplier price also when product has batch
2020-07-18 23:08:20 +02:00
Oarces DEV
f3e3c47af3
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 23:04:22 +02:00
Laurent Destailleur
0179800236
Merge pull request #14257 from cmfpmatik/cmfpmatik-order_prospect-1
...
Add the possibility for the prospect to order
2020-07-18 23:03:34 +02:00
Laurent Destailleur
15cdb3ed79
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0
2020-07-18 23:00:09 +02:00
Laurent Destailleur
ac92a9fa40
Doc more complete
2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82
Fix comment
2020-07-18 19:41:11 +02:00
Laurent Destailleur
384cb22d3a
Merge pull request #14220 from FHenry/11.0
...
fix missing entity into fetch wharehouse
2020-07-18 19:32:24 +02:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering
...
Fix extrafields ordering on PDFs
2020-07-18 19:30:34 +02:00
Laurent Destailleur
eef66ae6ed
Fix var not defined
2020-07-18 19:22:03 +02:00
Laurent Destailleur
bb4543167f
FIX #14222
2020-07-18 19:19:12 +02:00
Laurent Destailleur
ab32e3e1a9
Merge pull request #14222 from pstructures/PSdevelop
...
Error Caused by $taskid Variable not existing
2020-07-18 19:15:28 +02:00
Laurent Destailleur
ecfcbeef26
Merge pull request #14229 from FHenry/12.0_fix_ShowAdressThirdpartyOption_Extrafield_linkobject
...
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-18 19:13:52 +02:00
Laurent Destailleur
a8fbec8491
Merge pull request #14216 from grandoc/new_branch_11_07_2020
...
Minimum version of PHP required by module
2020-07-18 19:12:50 +02:00
Laurent Destailleur
cd997d216e
Merge pull request #14230 from cfoellmann/fix-default-search
...
fix the global `DEFAULT_SEARCH_INTO_MODULE`
2020-07-18 19:11:23 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
...
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
Laurent Destailleur
f07a1a6d1e
FIX for #14253
2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645
FIX for #14253
2020-07-18 18:52:33 +02:00
Oarces DEV
97826f140f
Add the possibility for the prospect to order
...
A prospect can do make order everywhere in Dolibarr, except in order tab...
https://www.dolibarr.fr/forum/t/nouvelle-commande-ou-sont-les-prospects/33275/7
2020-07-18 11:55:42 +02:00
stickler-ci
28bc001ba9
Fixing style errors.
2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e
New: ##12972 Update supplier price also when product has batch
2020-07-17 10:50:24 +02:00
Abdessalam@MEGALOGI
9d481cf15e
Update card.php
...
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-15 20:21:27 +01:00
florian HENRY
d2e528d8c1
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-15 17:45:34 +02:00
Alexandre SPANGARO
8d9f0dc4b2
Merge remote-tracking branch 'upstream/develop' into 13a1
2020-07-15 13:53:55 +02:00
Francis Appels
1bc1fd4cb4
Fix date in supplier price log tooltip.
2020-07-15 11:24:11 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
...
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
...
add column 'label' for short term description in english
add new Incoterm DPU (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
florian HENRY
f4074428f8
fix filter wharehouse list on ref
2020-07-14 09:38:52 +02:00
Christian Foellmann
a4e9c478e7
fix the global DEFAULT_SEARCH_INTO_MODULE - current value will not push anything above the core modules
2020-07-13 18:14:57 +02:00
florian HENRY
72e0250117
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:53:00 +02:00
florian HENRY
1173059e7b
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:52:41 +02:00
florian HENRY
96d26be1d4
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:51:58 +02:00
florian HENRY
045fbad616
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:48:21 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt)
2020-07-13 14:24:07 +02:00
Christian Foellmann
4674367099
remove old commented out code lines
2020-07-13 14:18:16 +02:00
Christian Foellmann
d43c30defd
change level of left menu for thirdparty types
2020-07-13 14:17:12 +02:00
Matt Sidnell
50e3822465
Merge branch 'PSdevelop' of https://github.com/pstructures/dolibarr-core into PSdevelop
2020-07-12 21:22:06 +01:00
Matt Sidnell
2797c5e65f
Updated Issue with declared progress
2020-07-12 21:21:34 +01:00
mattsidnell
ac945b5d96
Merge pull request #14 from Dolibarr/develop
2020-07-12 20:35:42 +01:00
florian HENRY
32e4635e84
fix missing entity into fetch wharehouse
2020-07-12 21:34:13 +02:00
Matt Sidnell
378c8c4691
Error on time pent page where progress was getting unset
2020-07-12 20:34:04 +01:00
florian HENRY
7b5072a21b
fix missing entity
2020-07-12 10:10:46 +02:00
florian HENRY
2f8968478d
fix missing entity into fetch wahrehouse
2020-07-12 10:06:04 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Philippe GRAND
ffae6b02c1
Minimum version of PHP required by module
2020-07-11 15:11:39 +02:00
Philippe GRAND
448f031948
Minimum version of PHP required by module
2020-07-11 15:11:15 +02:00
Philippe GRAND
5902dd6df3
Minimum version of PHP required by module
2020-07-11 15:10:53 +02:00
Philippe GRAND
2906e9b848
Minimum version of PHP required by module
2020-07-11 15:10:26 +02:00
Philippe GRAND
fc778e433f
Minimum version of PHP required by module
2020-07-11 15:10:02 +02:00
Philippe GRAND
8c5bdb8fb6
Minimum version of PHP required by module
2020-07-11 15:09:36 +02:00
Philippe GRAND
3ee18e5852
Minimum version of PHP required by module
2020-07-11 15:09:15 +02:00
Philippe GRAND
1d5a1beb79
Minimum version of PHP required by module
2020-07-11 15:08:52 +02:00
Philippe GRAND
1bb60ca7cc
Minimum version of PHP required by module
2020-07-11 15:08:28 +02:00
Philippe GRAND
1358801316
Minimum version of PHP required by module
2020-07-11 15:08:00 +02:00
Philippe GRAND
b4252b899c
Minimum version of PHP required by module
2020-07-11 15:07:33 +02:00
Philippe GRAND
9451148928
Minimum version of PHP required by module
2020-07-11 15:07:09 +02:00
Philippe GRAND
bbde5a3c95
Minimum version of PHP required by module
2020-07-11 15:06:44 +02:00
Philippe GRAND
05b97dc134
Minimum version of PHP required by module
2020-07-11 15:06:17 +02:00
Philippe GRAND
eb602d8bae
Minimum version of PHP required by module
2020-07-11 15:05:49 +02:00
Philippe GRAND
2e6addae11
Minimum version of PHP required by module
2020-07-11 15:05:20 +02:00
Philippe GRAND
f453c2272a
Minimum version of PHP required by module
2020-07-11 15:04:54 +02:00
Philippe GRAND
3a4f526ccd
Minimum version of PHP required by module
2020-07-11 15:04:31 +02:00
Philippe GRAND
8f37bb5a69
Minimum version of PHP required by module
2020-07-11 15:04:06 +02:00
Philippe GRAND
d4562a91ff
Minimum version of PHP required by module
2020-07-11 15:03:38 +02:00
Philippe GRAND
8d06471a4e
Minimum version of PHP required by module
2020-07-11 15:03:00 +02:00
Philippe GRAND
b26a1042d2
Minimum version of PHP required by module
2020-07-11 15:02:03 +02:00
Philippe GRAND
b2af2320ef
Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020
2020-07-11 14:57:26 +02:00
Philippe GRAND
a61955234f
Minimum version of PHP required by module
2020-07-11 14:54:23 +02:00
Philippe GRAND
b02b6db181
Minimum version of PHP required by module
2020-07-11 14:43:30 +02:00
Philippe GRAND
8a2db6bad5
Minimum version of PHP required by module
2020-07-11 14:42:53 +02:00
stickler-ci
0d58c55167
Fixing style errors.
2020-07-11 12:42:38 +00:00
Philippe GRAND
ece128c9c5
Minimum version of PHP required by module
2020-07-11 14:42:04 +02:00
Philippe GRAND
7c84406494
Minimum version of PHP required by module
2020-07-11 14:41:10 +02:00
Philippe GRAND
370a7bcf38
Minimum version of PHP required by module
2020-07-11 14:39:46 +02:00
Philippe GRAND
0531dd00d9
Minimum version of PHP required by module
2020-07-11 14:38:44 +02:00
Philippe GRAND
baa9c39ace
Minimum version of PHP required by module
2020-07-11 14:38:03 +02:00
Philippe GRAND
872b99be42
Minimum version of PHP required by module
2020-07-11 14:37:25 +02:00
Philippe GRAND
0fdb209045
Minimum version of PHP required by module
2020-07-11 14:36:22 +02:00
Philippe GRAND
7f5ebf2e31
Minimum version of PHP required by module
2020-07-11 14:35:36 +02:00
Philippe GRAND
c9c5d9cc70
Minimum version of PHP required by module
2020-07-11 14:34:11 +02:00
Philippe GRAND
fd01a4d154
Minimum version of PHP required by module
2020-07-11 14:31:16 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
276bc4f908
Fix sql error
2020-07-11 11:21:28 +02:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
8972271be0
Add link to stock at date page
2020-07-10 21:12:15 +02:00
Laurent Destailleur
c91236244e
Enhance Stock at date feature
2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f
Trans
2020-07-10 16:27:59 +02:00
Laurent Destailleur
a059154fdf
FIX reposition
2020-07-10 13:59:54 +02:00
Laurent Destailleur
f92f279527
FIX Navigation from bank receipts
2020-07-10 13:56:54 +02:00
Laurent Destailleur
db6ed7a646
FIX Navigation from bank receipts
2020-07-10 13:40:33 +02:00
Anthony Berton
dc8bce2f43
Update list.php
2020-07-10 11:42:59 +02:00
Laurent Destailleur
2dc1008663
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
ff5a2d459d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-10 05:20:09 +02:00
Laurent Destailleur
071b909d38
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:19:21 +02:00
Laurent Destailleur
79a6246666
FIX Fails to retraive accounting code of social contribution sometimes
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:14:54 +02:00
Laurent Destailleur
17ebdd73fe
FIX Fails to retraive accounting code of social contribution sometimes
2020-07-10 05:13:24 +02:00
Laurent Destailleur
07b2053a4b
Fix regression
2020-07-10 03:59:28 +02:00
Laurent Destailleur
bb056fc811
Fix bad return value
2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop
...
Added Hook to showOptionals Function
2020-07-10 02:54:05 +02:00
Laurent Destailleur
b6452dbbc0
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-10 02:51:25 +02:00
Laurent Destailleur
a36c6a8dda
FIX #14209
2020-07-10 02:46:59 +02:00
Laurent Destailleur
96efb77b8c
FIX CSS
2020-07-10 02:38:37 +02:00
Laurent Destailleur
5cf9bfcb5f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e
clean code
2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8
Fix error in stripe payment if no country defined
2020-07-10 02:28:00 +02:00
Laurent Destailleur
726d7e39e6
CSS
2020-07-10 02:17:08 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Laurent Destailleur
e8dd99a9cd
Trans
2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565
Fix missing trans
2020-07-10 00:57:29 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
fd95551940
Fix upload of file in import module
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
gauthier
25509e74d3
FIX : order by amount ht uses wrong column
2020-07-09 17:27:14 +02:00
atm-josselin
71a5cc7522
Show label on batch card
2020-07-09 17:13:53 +02:00
Laurent Destailleur
cb7f78e9d3
Fix tpl
2020-07-09 16:25:51 +02:00
Laurent Destailleur
6b5f46624c
Fix label of AWP
2020-07-09 16:19:40 +02:00
Laurent Destailleur
b8721e0c64
FIX Change position of line in BOM
2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e
Fix extrafields ordering on PDFs
2020-07-10 00:51:41 +11:00
Laurent Destailleur
a59b37cb72
Trans
2020-07-09 15:44:42 +02:00
Laurent Destailleur
6046f1f9d6
css
2020-07-09 14:12:19 +02:00
Laurent Destailleur
e6b241a083
NEW Show tags and status in search list of website pages
2020-07-09 14:07:41 +02:00
Laurent Destailleur
b55b0e505f
FIX wrap on contract ref
2020-07-09 13:56:29 +02:00
Laurent Destailleur
46119dc786
Fix per user
2020-07-09 12:49:48 +02:00
Laurent Destailleur
0394ce1865
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-07-09 12:46:10 +02:00
Laurent Destailleur
f756864670
CSS
2020-07-09 12:44:31 +02:00
Laurent Destailleur
49faaf750f
Trans
2020-07-09 12:39:43 +02:00
Laurent Destailleur
ce1649233d
FIX CSS
2020-07-09 12:39:00 +02:00
Laurent Destailleur
a9eccd80b1
FIX CSS
2020-07-09 12:38:05 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
8589e122c6
css
2020-07-09 11:58:44 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
56c90c289a
Prepare 12.0.2
2020-07-08 18:19:20 +02:00
Laurent Destailleur
1dfd2d565b
FIX Reposition and nav
2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c
FIX Reposition and nav
2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
edb4aac8d3
CSS
2020-07-08 18:09:35 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Matt Sidnell
39104009ef
Updated to match inline with code received from fork
2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7
Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc...
2020-07-08 14:20:59 +01:00
Laurent Dinclaux
37401df106
Improve printStdColumnContent by passing the $pdf object.
...
It isn't possible to replace the pdf edition done by this method without the $pdf object.
2020-07-08 14:48:34 +11:00
Laurent Destailleur
bec27a04ba
Trans
2020-07-07 21:16:20 +02:00
Tim Otte
a73f77cfef
Fixed same error like before
2020-07-07 12:43:15 +02:00
Laurent Dinclaux
f2adc3de4f
Fix Dolibarr/dolibarr#14181 . Limits and accuracy form not saving modified values
2020-07-07 18:03:11 +11:00
stickler-ci
e032c2f7b9
Fixing style errors.
2020-07-07 05:09:28 +00:00
Alexandre SPANGARO
e4cc3e1b2c
NEW: Add column quantity in product margin page
2020-07-07 07:05:18 +02:00
Laurent Destailleur
cb5577826d
Look and feel v13
2020-07-07 03:50:14 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
67c164df07
FIX reposition was broken if url end with #anchor
2020-07-06 22:27:19 +02:00
Laurent Destailleur
33a78dbcef
FIX reposition was broken if url end with #anchor
2020-07-06 22:26:19 +02:00
Laurent Destailleur
415398fc66
Better contrast
2020-07-06 21:06:32 +02:00
Laurent Destailleur
e13d3ce657
Trans
2020-07-06 20:57:47 +02:00
Laurent Destailleur
f72a836231
Fix look and feel v12
2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a
Fix param GETPOST
2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9
Fix note in creation
2020-07-06 16:52:28 +02:00
Laurent Destailleur
61a7f54877
Fix look and field
2020-07-06 15:55:41 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Laurent Destailleur
471f3e66e6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/projet/tasks/list.php
2020-07-06 12:27:25 +02:00
Laurent Destailleur
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link
...
NEW show links for select and multi-select in category extra field
2020-07-06 12:12:31 +02:00
Laurent Destailleur
21bec139ca
Merge pull request #14183 from FHenry/12.0
...
remove warning when date end contract line empty
2020-07-06 12:06:42 +02:00
Laurent Destailleur
b4cd670b09
Merge pull request #14186 from atm-gauthier/10.0_fix_search_soc
...
FIX : soc filter doesn't work on task list
2020-07-06 12:05:40 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing
...
Fix email spoofing - with hidden conf
2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php
2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php
2020-07-06 12:00:14 +02:00
Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8
Fix menu organisation.
2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851
Fix regression
2020-07-06 11:31:05 +02:00
Laurent Destailleur
1399ac9b41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-06 11:28:17 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
stickler-ci
cb7b66d52c
Fixing style errors.
2020-07-06 09:19:27 +00:00
Laurent Destailleur
056aa81ed3
Fix responsive
2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef
FIX : soc filter doesn't work on task list
2020-07-06 09:58:44 +02:00
Alexandre SPANGARO
dc40ddb370
Some correction
2020-07-06 09:56:28 +02:00
Laurent Destailleur
b76828df9f
Fix use of newtoken()
2020-07-06 09:39:26 +02:00
Alexandre SPANGARO
82c96a4f83
Fix SticklerCi
2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
1855d54019
Fix data insertion
2020-07-06 04:31:32 +02:00
Alexandre SPANGARO
725ef1057d
Some correct
2020-07-06 04:19:50 +02:00
Alexandre SPANGARO
7107354f81
Merge branch '10.0_intracommreport' of https://github.com/aspangaro/dolibarr into 10.0_intracommreport
2020-07-06 03:29:07 +02:00
Alexandre SPANGARO
0525dd3c1f
Fix migration - Move to v13
2020-07-06 03:28:53 +02:00
stickler-ci
19eef8aa93
Fixing style errors.
2020-07-06 01:26:46 +00:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
0d3cfe445f
Fix phpcs
2020-07-05 14:16:57 +02:00
Laurent Destailleur
776e305272
Typo
2020-07-05 13:50:21 +02:00
Laurent Destailleur
1b2cea3f9f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-05 13:32:10 +02:00
Laurent Destailleur
8df431f525
Look and feel v12
2020-07-05 13:30:56 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
54a77a604c
FIX Missing token
2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e
Look and feel v12
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5
Trans
2020-07-05 12:47:32 +02:00
Laurent Destailleur
c9e5536fbc
FIX Missing token
2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85
Look and feel v12
2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70
Trans
2020-07-05 12:30:04 +02:00
Laurent Destailleur
93a3efac3a
Fix phpcs
2020-07-04 19:26:51 +02:00
Laurent Destailleur
b726e96f4b
FIX Update form erased extrafields that were hidden
2020-07-04 17:09:20 +02:00
florian HENRY
03ae31eced
remove warning when date end contract line empty
2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22
remove warning when date end contract line empty
2020-07-04 16:37:11 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9
Fix sql type
2020-07-04 16:10:13 +02:00
Laurent Destailleur
9912ffd555
Fix position of button
2020-07-04 13:45:28 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06
Fix trans
2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b
Debug credit transfer module
2020-07-03 19:27:23 +02:00
Laurent Destailleur
1e7daa29a5
Hide a useless option
2020-07-03 01:46:50 +02:00
Laurent Destailleur
636f1e642d
Fix param of product id to switch to list of order
2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish
2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php
2020-07-03 00:57:15 +02:00
Laurent Destailleur
4fba3ec872
Merge pull request #14115 from atm-florian/10.0
...
fix entity on supplier order
2020-07-03 00:50:51 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html
...
FIX html lost on html extrafield
2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:40:59 +02:00
oscim
ca66eac76c
Update project.class.php
...
Fix order of delete extra prev table of project
2020-07-03 00:40:15 +02:00
Laurent Destailleur
f85d240dcf
Merge pull request #14145 from oscim/patch-41
...
Update project.class.php
2020-07-03 00:39:45 +02:00
Laurent Destailleur
18fa4c4105
Update card.php
2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef
Fix syntax
2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d
fix #14143
2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227
Hotfix for an error in v12
2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-03 00:32:25 +02:00
Laurent Destailleur
751174a983
Merge pull request #14156 from Tim-Otte/fix-proposals-urgent
...
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-03 00:32:03 +02:00
Laurent Destailleur
9c504c1b3d
Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields
...
FIX change selected fields on company card
2020-07-03 00:30:34 +02:00
Laurent Destailleur
cae55da399
Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by
...
NEW add order by lastname and firstname by default
2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
...
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php
2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
...
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3
Merge pull request #14162 from laurantines/develop
...
Update list.php in Adherents
2020-07-03 00:24:54 +02:00
Laurent Destailleur
0ea55209ae
Merge pull request #14165 from ptibogxiv/patch-345
...
FIX non numeric value on comm/card.php
2020-07-03 00:24:32 +02:00
ksar
0a13e03792
FIX : Correct ModuleBuilder left menu
2020-07-03 00:21:39 +02:00
Laurent Destailleur
70b58b5755
Merge pull request #14169 from ksar-ksar/develop
...
FIX : Correct ModuleBuilder left menu
2020-07-03 00:20:59 +02:00
Laurent Destailleur
d24c6f7a81
Merge pull request #14164 from ptibogxiv/patch-344
...
FIX takepos 12 hook
2020-07-03 00:20:28 +02:00
Laurent Destailleur
91266babea
Merge pull request #14170 from andreubisquerra/master
...
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-03 00:19:35 +02:00
Laurent Destailleur
75409e3ed0
Merge pull request #14171 from hregis/12.0_bug
...
FIX missing possibility to change entity when propal cloning
2020-07-03 00:18:35 +02:00
Laurent Destailleur
6c01cc16f8
Update commande.class.php
2020-07-03 00:14:22 +02:00
Laurent Destailleur
16b327f106
Debug module credit transfer
2020-07-02 15:45:11 +02:00
BENKE Charlene
b3396a6454
better look & feel icon on dropdown
2020-07-02 14:40:56 +02:00
quentin
642e75c3dd
FIX wrong origin
2020-07-02 14:16:31 +02:00
Regis Houssin
a5431a40da
FIX missing possibility to change entity when propal cloning
2020-07-02 10:16:20 +02:00
Laurent Destailleur
cfcb40dd2a
Fix scrutinizer errors
2020-07-02 03:48:32 +02:00
Laurent Destailleur
6b16f64928
Fix properties used that does not exists
2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62
Fix scrutinizer errors
2020-07-02 03:37:01 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
andreubisquerra
452cca503a
Fixes
2020-07-02 00:11:17 +02:00
andreubisquerra
9e4d7627f3
Fix travis
2020-07-01 22:55:00 +02:00
andreubisquerra
d2a78b8aa4
Update appearance.php
2020-07-01 22:44:18 +02:00
jove@bisquerra.com
76f3724191
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-01 22:34:35 +02:00
ksar
22448b19f4
FIX : Correct ModuleBuilder left menu
2020-07-01 22:19:10 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
d3c23428d5
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54
FIX Use of office365 TLS with SMTPs method.
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:01:46 +02:00
Laurent Destailleur
226c907e35
FIX Use of office365 TLS with SMTPs method.
2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8
Fix email spoofing - with hidden conf
2020-07-01 16:55:23 +02:00
ptibogxiv
cc132775f3
FIX non numeric value on comm/car.php
2020-07-01 16:18:19 +02:00
stickler-ci
92f4744d11
Fixing style errors.
2020-07-01 13:22:43 +00:00
ptibogxiv
5e259d26ab
FIX takepos hook
...
can add more than 1 button within 1 module
2020-07-01 15:20:42 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
quentin
d2a364eea8
NEW get all child recursively
2020-07-01 14:10:43 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
5f2486049e
Fix trans
2020-07-01 13:22:15 +02:00
Laurent Destailleur
5f37f54675
Fix warning
2020-07-01 13:16:06 +02:00
laurantines
a34c6ec7b0
Update list.php in Adherents
...
Add Address in search
2020-07-01 13:12:52 +02:00
lvessiller
caa3661eeb
NEW add order by lastname and firstname by default in get sales representatives
2020-07-01 09:16:44 +02:00
lvessiller
918e669c98
FIX change selected fields on company card
2020-06-30 16:33:18 +02:00
Laurent Destailleur
b8ea58f18c
Fix phpcs
2020-06-30 16:15:10 +02:00
Tim Otte
94a1d71fba
Hotfix for an error in v12
2020-06-30 15:20:30 +02:00
Laurent Destailleur
4baa00ba89
Fix phpcs
2020-06-30 13:20:46 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
4f1ac84a19
Fix can't find link to edit table plan
2020-06-30 12:07:24 +02:00
gauthier
6553c40bea
FIX : create a deposit with amount using comma didn't work
2020-06-30 11:23:55 +02:00
Laurent Destailleur
88cf904ced
Fix edit of tag of website
2020-06-30 02:50:58 +02:00
Laurent Destailleur
9bb0ef04f5
Fix upload of file in import module
2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
2020-06-29 17:58:04 +02:00
Laurent Destailleur
f34a3785f0
FIX CSS
2020-06-29 16:02:50 +02:00
Laurent Destailleur
2d0d2e0019
FIX CSS
2020-06-29 16:02:08 +02:00
Laurent Destailleur
3d8d55a531
Fix bad path in import section
2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f
FIX Avoid warning when creating a module with already existing files
2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300
FIX SQL syntax error when editing extrafields
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
oscim
eb22947c07
Update project.class.php
...
Fix order of delete extra prev table of project
2020-06-29 14:01:48 +02:00
Laurent Destailleur
7c5b0be6a3
FIX SQL syntax error when editing extrafields
2020-06-29 13:48:00 +02:00
Laurent Destailleur
8bb11039dc
Clean code
2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668
Clean code
2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438
Trans
2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a
Prepare 12.0.1
2020-06-29 09:15:49 +02:00
Francis Appels
5d65b5f660
fix html should not do price2num
2020-06-29 09:07:54 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106
FIX upload documents into manual ECM was reported a permission error
2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
70efaa4235
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
aab1358b0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:43:46 +02:00
Laurent Destailleur
b47ae06973
Clean code
2020-06-28 21:43:34 +02:00
Laurent Destailleur
b35550a3dd
Merge pull request #14122 from TobiasSekan/CommonListForLeaveLog
...
New: Common list behavior for leave log
2020-06-28 21:30:49 +02:00
Laurent Destailleur
aa91bada07
Merge pull request #14114 from atm-maxime/new_project_task_progress_filter
...
NEW filter on progress column in task list
2020-06-28 21:22:33 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php
...
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
...
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug
2020-06-28 21:19:11 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php
2020-06-28 21:14:49 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
...
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
df7996a8eb
Merge pull request #14126 from OPEN-DSI/fix-import-upload-file
...
FIX upload file in import module
2020-06-28 21:13:00 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2
...
FIX: SQL Problem in supplier invoice list
2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3
...
FIX: SQL Problem in social contribution list
2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php
2020-06-28 21:11:25 +02:00
Laurent Destailleur
3fa98a4f01
Merge pull request #14135 from OPEN-DSI/new-export-societe-contact-region
...
NEW add region in export companies and contacts
2020-06-28 21:09:56 +02:00
Laurent Destailleur
8f409f4c58
Merge pull request #14137 from TobiasSekan/CommonListMonthlyLeaveView
...
NEW: Common behavior for monthly leave list view
2020-06-28 21:09:27 +02:00
Laurent Destailleur
0aa08edb38
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
...
NEW can edit and set sales representatives directly on thirdparty card
2020-06-28 21:08:24 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate
...
Fix missing translate key
2020-06-28 21:07:49 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
518c126abf
NEW Add a page to list Stock at a given date.
2020-06-28 20:31:07 +02:00
Laurent Destailleur
a3ae7a76b8
WIP Stock at date
2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143
2020-06-28 17:53:48 +02:00
Laurent Destailleur
d22a0f702e
WIP Stock at date
2020-06-28 17:34:30 +02:00
Francis Appels
731978fda6
FIX html lost on html extrafield
2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
41c6155922
Hiden useless entry
2020-06-27 14:44:38 +02:00
Laurent Destailleur
d5324ff3db
Fix template
2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15
Fix template
2020-06-27 14:38:40 +02:00
Laurent Destailleur
5a4ed34c0d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 03:28:44 +02:00
Laurent Destailleur
4d01030fd9
Fix phpcs
2020-06-27 02:00:42 +02:00
Laurent Destailleur
90bcc64547
Fix phpcs
2020-06-27 01:59:08 +02:00
Laurent Destailleur
ec5cfee150
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2
Fix phpcs
2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Laurent Destailleur
3655f6f407
FIX #14109
2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c
FIX #14112
2020-06-26 20:35:06 +02:00
Laurent Destailleur
8e324c36ff
Prepare 11.0.5
2020-06-26 19:39:01 +02:00
Laurent Destailleur
ee0bdde8c1
FIX Filter on status, closing opening status
2020-06-26 19:36:22 +02:00
Laurent Destailleur
d6346522b8
Code comment
2020-06-26 19:36:15 +02:00
Laurent Destailleur
be5729de23
FIX Filter on status, closing opening status
2020-06-26 19:35:09 +02:00
Laurent Destailleur
b0d46d0c4c
Code comment
2020-06-26 18:56:05 +02:00
Francis Appels
f4494db73f
Fix missing translate key
2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3
Fix #14120
2020-06-26 17:17:13 +02:00
lvessiller
ad36447295
NEW can edit and set sales representatives directly on thirdparty card
2020-06-26 12:20:53 +02:00
stickler-ci
a8ad21c011
Fixing style errors.
2020-06-26 08:59:50 +00:00
Tobias Sekan
2bb8efa86f
Common behavior for monthly leave list view
2020-06-26 10:54:27 +02:00
gauthier
858a751eef
FIX : $_POST must be GETPOST
2020-06-26 10:51:04 +02:00
lvessiller
3eb695ffa8
NEW add region in export companies and contacts
2020-06-26 09:14:06 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
10a4188eff
Clean template
2020-06-26 01:14:24 +02:00
Alexandre SPANGARO
0c60c9fd0d
FIX: SQL Problem in social contribution list
2020-06-25 20:53:03 +02:00
Alexandre SPANGARO
62f55b8549
FIX: SQL Problem in supplier invoice list
2020-06-25 20:43:41 +02:00
lvessiller
c689b91539
FIX upload file in import module
2020-06-25 16:59:48 +02:00
Florian Mortgat
ccfe6f18fe
FIX 10.0 - fatal with postgres
...
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
stickler-ci
adb3cc72f9
Fixing style errors.
2020-06-25 12:44:57 +00:00
Tobias Sekan
289886cd29
missing update
2020-06-25 14:37:09 +02:00
Tobias Sekan
22f708b95a
Add search, sort, select for leave log view
2020-06-25 14:36:42 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
a6ecf6dbbc
Fix syntax error
2020-06-25 12:18:57 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7
Fix bad object
2020-06-25 12:17:06 +02:00
Laurent Destailleur
2f5dbdc8a3
Fix bad property
2020-06-25 11:54:37 +02:00
Laurent Destailleur
bbb8c9418e
Fix bad property
2020-06-25 11:51:46 +02:00
Laurent Destailleur
e146d0fe21
Fix url
2020-06-25 02:51:14 +02:00
Laurent Destailleur
c32151d356
Prepare page for stock at date
2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
9c23890c26
Fix phpcs
2020-06-24 20:03:12 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5
FIX: SQL Problem in customer invoice list
2020-06-24 14:03:16 +02:00
Laurent Destailleur
2865d6bd15
Fix set of free product
2020-06-24 13:39:00 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
florian HENRY
77868ad2a3
fix entity on supplier order
2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8
fix enbtoty on supplier order
2020-06-24 12:24:47 +02:00
Maxime Kohlhaas
69b320f347
New : filter on progress column in task list
2020-06-24 10:17:46 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
1762e10e69
Fix return code not returned
2020-06-24 09:55:10 +02:00
Laurent Destailleur
a854d955b8
Fix rounding
2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476
Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e
Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 15:52:17 +02:00
Laurent Destailleur
d05c60baf0
Fix css
2020-06-23 14:33:34 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006
Fix alert picto of expired services not visible
...
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
daba55762f
Fix missing filter on status enabled
2020-06-22 13:07:34 +02:00
Laurent Destailleur
84d3d633e5
Fix typo
2020-06-22 11:34:54 +02:00
Laurent Destailleur
194a094d23
Fix deletion of a thirdparty must not delete the stripe account.
2020-06-22 11:32:58 +02:00
Regis Houssin
32844a8d0c
FIX clean code
2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f
NEW show links for select and multi-select in category extra field
2020-06-22 08:57:52 +02:00
Laurent Destailleur
4cfb9dc7c5
css
2020-06-22 04:40:04 +02:00
Laurent Destailleur
058a0d4fa7
Fix look and feel v12
2020-06-22 04:27:16 +02:00
Laurent Destailleur
d816d45331
Look and feel v13
2020-06-22 04:10:13 +02:00
Laurent Destailleur
1ce5b78a6b
Fix error message not reported
2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a
FIX We force "modify" for avoid some field not modify
2020-06-21 21:10:51 +02:00
Laurent Destailleur
0139a840ae
Fix setup
2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66
FIX For better compatibility with Samba4 AD
2020-06-21 19:52:15 +02:00
Marc Guenneugues
f86f4c1e1d
Change label of checkbox to be more explicit
2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565
Fix lang
2020-06-21 15:25:34 +02:00
Laurent Destailleur
d84fbb7165
css
2020-06-20 18:59:13 +02:00
Laurent Destailleur
3a0f950ad0
Fix phpcs
2020-06-20 18:46:49 +02:00
Laurent Destailleur
bb3320f103
FIX #14104
2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac
FIX #14092 #14093
2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
andreubisquerra
515d18020d
Add security check
2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e
Fix travis
2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b
Printable QR
2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1
Trans
2020-06-20 12:19:25 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
...
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
...
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
...
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php
2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
...
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
2de3eb8ac0
Fix CSS
2020-06-20 00:00:17 +02:00
Laurent Destailleur
d632f1c6b2
Fix url
2020-06-19 23:08:29 +02:00
Laurent Destailleur
d8927143fa
Fix chrome style
2020-06-19 20:01:57 +02:00
Laurent Destailleur
f24e73141e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc
FIX #13877
2020-06-19 14:50:33 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
florian HENRY
07923e0baf
fix f.fk_user_author unknow because after stange join with coma
2020-06-19 10:08:19 +02:00
florian HENRY
c2920083d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning
2020-06-19 09:49:50 +02:00
florian HENRY
29c049e358
set correct global conf
2020-06-19 09:49:43 +02:00
Laurent Destailleur
01914980d9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/notice.php
2020-06-19 00:45:06 +02:00
Laurent Destailleur
623a9db4e7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/composition/card.php
htdocs/public/notice.php
2020-06-19 00:42:20 +02:00
Laurent Destailleur
22ca5e0671
Fix XSS reported by C. Weiler <sak1.s3curity@gmail.com> in notice.php
2020-06-19 00:39:27 +02:00
Laurent Destailleur
b8c0ed13f3
Fix can't find link to generate barcode sheets
2020-06-19 00:25:59 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
...
Related to :
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976
Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix).
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
7fef9a813e
fix warning and clean old code about multiselect category
2020-06-18 20:03:03 +02:00
florian HENRY
a705cc41ae
fix: same feature on invoice as on orders
2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949
fix: same feature on invoice as on orders
2020-06-18 19:42:23 +02:00
Laurent Destailleur
b9218a1c4c
Debug v12
2020-06-18 19:21:21 +02:00
Laurent Destailleur
4cfe1fcd6b
Typo
2020-06-18 15:57:50 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c1a9826455
Fix color of tags
2020-06-18 15:33:52 +02:00
Laurent Destailleur
531bfe217b
Merge fields
2020-06-18 15:11:35 +02:00
Laurent Destailleur
6e761d5c98
Can get first image from index using a path without name
2020-06-18 15:07:43 +02:00
Laurent Destailleur
c986ab95cf
FIX Edit of a time spent line
2020-06-18 14:09:43 +02:00
Laurent Destailleur
ade542eee7
Sync language
2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef
Fix sepa supplier count
2020-06-18 03:44:26 +02:00
Laurent Destailleur
eef07afc90
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
2020-06-18 03:32:13 +02:00
Laurent Destailleur
a4059882a9
Fix update pagination
2020-06-18 03:03:02 +02:00
Laurent Destailleur
1ed649ff28
Fix tooltip on project not visible sometimes
2020-06-18 02:50:46 +02:00
Laurent Destailleur
a5ce3ada0a
Keep feature experimental as it need a lot of change
2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
dc70cab2cb
Fix tooltip
2020-06-17 22:29:05 +02:00
Laurent Destailleur
42860d752c
Fix templates
2020-06-17 22:11:22 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
54596d2286
FIX #13967
2020-06-17 19:26:17 +02:00
Laurent Destailleur
de5a2d738b
FIX #14001
2020-06-17 18:39:25 +02:00
Laurent Destailleur
32eaa9137c
FIX #14034
2020-06-17 18:29:29 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
adb988a18b
FIX Add missing label of event for #14094 . Still missing link to object
2020-06-17 15:45:26 +02:00
Laurent Destailleur
13cdd5bc45
FIX #14095
2020-06-17 15:42:55 +02:00
Laurent Destailleur
8f4a181380
css
2020-06-17 15:35:52 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
fdbb6debc9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94
FIX Privilege escalation reported by wizlynx WLX-2020-011
2020-06-17 13:29:43 +02:00
Laurent Destailleur
d863f9a7ad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 13:04:34 +02:00
Laurent Destailleur
7d3c176727
Prepare convertion of field "montant" into "amount"
2020-06-17 12:45:56 +02:00
Laurent Destailleur
9f69e31950
Merge pull request #14089 from atm-quentin/NEW_hide_contract_closed_lines
...
NEW hide closed contract lines
2020-06-17 12:11:00 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
bbbcd5b6b3
Fix phpcs
2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e
FIX Upload of documents for members using the REST API.
2020-06-16 22:48:14 +02:00
Laurent Destailleur
64b2a2d92f
Fix phpcs
2020-06-16 22:46:36 +02:00
Laurent Destailleur
18d20f3a0e
Merge pull request #14080 from EuskalMoneta/develop
...
FIX Upload of documents for members using the REST API.
2020-06-16 22:43:19 +02:00
Laurent Destailleur
f0e4fa40f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a
Complete #14078
2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports
...
11.0 - FIX - missing currency columns in supplier exports
2020-06-16 22:00:56 +02:00
Laurent Destailleur
cbd99ea7a2
FIX #14088
2020-06-16 21:57:49 +02:00
Laurent Destailleur
e8b44ef89e
css
2020-06-16 17:55:46 +02:00
gauthier
e50d239322
FIX : force rounding 2 on export ld compta
2020-06-16 11:40:01 +02:00
Florian Mortgat
18d5ec7750
11.0 - FIX - missing currency columns in supplier exports
...
(copy-pasted from modFacture.class.php)
2020-06-16 10:56:10 +02:00
stickler-ci
3384763c6b
Fixing style errors.
2020-06-16 08:54:50 +00:00
atm-quentin
e3d94d44ab
NEW hide closed contract lines
2020-06-16 10:45:49 +02:00
Laurent Destailleur
9ec8051a37
NEW Add param to not show links when output tags
2020-06-16 02:56:48 +02:00
Laurent Destailleur
e28bbfbd63
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-15 16:10:49 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
7b64e8643f
Trans and css
2020-06-15 16:08:48 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658
Fix rounding
2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8
Fix rounding
2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Xebax
a22c89da96
FIX Upload of documents for members using the REST API.
2020-06-14 14:58:09 +02:00
stickler-ci
79a7e4c149
Fixing style errors.
2020-06-13 07:44:48 +00:00
DEMAREST Maxime (Indelog)
9217ec47dc
Fix replace loan_calcmens() by loanCalcMonthlyPayment()
2020-06-13 09:33:02 +02:00
DEMAREST Maxime (Indelog)
44445ff9e6
Fix stickler
2020-06-13 09:32:54 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
b763b40d8c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66
Prepare v12
2020-06-12 19:30:23 +02:00
Laurent Destailleur
b7e7ccee54
Update demo
2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989
Fix We must include version into filename
2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968
Fix missing author into export_alias
2020-06-12 15:27:28 +02:00
Laurent Destailleur
c9cb978c39
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317
Fix We never add .noexe of files into medias dir
2020-06-12 15:20:28 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf
...
FIX : percent must be displayed on one line
2020-06-12 14:50:49 +02:00
Laurent Destailleur
acd0abf1ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:34 +02:00
Laurent Destailleur
6e81542148
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6
Fix We never add .noexe of files into medias dir
2020-06-12 14:35:50 +02:00
Laurent Destailleur
1ba03566dc
Fix case of delete contact not correctly implemented.
2020-06-12 02:15:02 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang
2020-06-12 01:58:47 +02:00
Laurent Destailleur
a0b6d9c4e0
css
2020-06-12 01:19:50 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql
2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql
2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-12 01:00:15 +02:00
Laurent Destailleur
012574b487
Update html.form.class.php
2020-06-12 00:51:19 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
Laurent Destailleur
d7cbd8a1d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/takepos/admin/setup.php
2020-06-11 23:36:55 +02:00
Laurent Destailleur
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html
...
FIX free text on cash desk
2020-06-11 23:33:31 +02:00
Laurent Destailleur
3527d011f5
Merge pull request #14006 from bafbes/abb110215
...
fix:The label must be a dictionary key
2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af
Update index.php
2020-06-11 23:15:00 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj
...
NEW Add show preview for mail attachement on form mail
2020-06-11 23:09:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation
...
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-11 23:05:55 +02:00
Laurent Destailleur
83df96f7d1
Merge pull request #14054 from OPEN-DSI/fix-takepos-terminal-free-text
...
FIX replace filter parameter "none" by "restricthtml" on cash desk
2020-06-11 23:02:46 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat
...
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring
...
Fix 11.0 - undef func measuringUnitString() in From::select_produits_fournis…
2020-06-11 23:02:01 +02:00
Laurent Destailleur
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save
...
Fix ticket file save
2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda
...
FIX 11.0 - fatal with postgres on contact/agenda.php
2020-06-11 23:01:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php
2020-06-11 22:58:58 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql
2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Anthony Berton
94e7fc20be
Create html.form.class.php
2020-06-11 18:41:52 +02:00
Anthony Berton
ce7767a154
Create 11.0.0-12.0.0.sql
2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:37:25 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
Laurent Destailleur
c70cd01971
Fix css
2020-06-11 17:58:00 +02:00
Laurent Destailleur
3831b56423
Missing tags
2020-06-11 17:07:41 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Regis Houssin
997cb214f1
FIX avoid error "Call to undefined function measuringUnitString()"
2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Anthony Berton
4a77d06b1e
o
2020-06-11 15:45:31 +02:00
Anthony Berton
182a34616f
Add files via upload
2020-06-11 15:39:05 +02:00
Anthony Berton
848c9df537
Add files via upload
2020-06-11 15:38:05 +02:00
Anthony Berton
9d43827844
Revert "Delete html.form.class.php"
...
This reverts commit aa275f2a79
2020-06-11 15:18:10 +02:00
Laurent Destailleur
a48f263af2
Fix phpcs
2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
6a3547f8af
css
2020-06-11 02:11:17 +02:00
Laurent Destailleur
5b882e333d
Fix tooltip on localtaxes
2020-06-10 23:00:17 +02:00
Laurent Destailleur
e94ef09977
css
2020-06-10 22:24:15 +02:00
Laurent Destailleur
5e13a7f1e2
css
2020-06-10 22:05:49 +02:00
ATM john
564b9df1e7
Fix ticket file save
2020-06-10 17:01:57 +02:00
gauthier
58ff96af30
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
2020-06-10 16:48:02 +02:00
Florian Mortgat
5bc80f8626
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d
FIX Sharing buttons
2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de
FIX Sharing buttons
2020-06-10 00:01:41 +02:00
Laurent Destailleur
4b2a570a23
Error message
2020-06-09 22:44:25 +02:00
Laurent Destailleur
a86e209a75
Fix message
2020-06-09 22:43:37 +02:00
Laurent Destailleur
c175fbd697
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
2020-06-09 22:09:57 +02:00
Laurent Destailleur
a9b85222c0
NEW The global header of a website can also have dynamic content
2020-06-09 22:07:06 +02:00
Laurent Destailleur
756ef0b583
Fix disallow < > into meta info
...
Fix message page regenerated
2020-06-09 21:43:42 +02:00
Florian Mortgat
d19febc2ca
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-09 17:34:24 +02:00
gauthier
92b89437d1
FIX : percent must be displayed on one line
2020-06-09 16:02:41 +02:00
DEMAREST Maxime (Indelog)
1ac341e651
Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list
2020-06-09 15:33:10 +02:00
Florian Mortgat
0a2099e0ac
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-09 14:22:32 +02:00
DEMAREST Maxime (Indelog)
e628730a3f
Add show preview for mail attachement on form mail
2020-06-09 11:35:46 +02:00
Laurent Destailleur
0f1447cf05
Fix position of clone
2020-06-08 23:42:48 +02:00
Laurent Destailleur
738fa35471
Fix clone web site
2020-06-08 23:37:49 +02:00
Laurent Destailleur
063b3263cc
Trans
2020-06-08 23:12:45 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1
Debug v12
2020-06-08 20:31:09 +02:00
Laurent Destailleur
cf976a2b98
Fix translation
2020-06-08 17:00:58 +02:00
stickler-ci
b4dd11ec98
Fixing style errors.
2020-06-08 14:00:57 +00:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
Laurent Destailleur
f4f0da6de2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39
Show more info to help fix corrupted data
2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1
Error message
2020-06-08 15:12:07 +02:00
Laurent Destailleur
2e06ce306a
Tooltip
2020-06-08 15:03:10 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
aed5e8a4ce
fix url
2020-06-08 12:25:17 +02:00
Laurent Destailleur
70bdd59548
Fix trans
2020-06-08 11:52:43 +02:00
VESSILLER
f010184008
FIX replace filter parameter "none" by "restricthtml"
2020-06-08 11:48:31 +02:00
Laurent Destailleur
c386f4b2e3
Maxi debug of direct debit order
2020-06-08 11:43:20 +02:00
Laurent Destailleur
a70e493c5d
Migration
2020-06-08 11:43:00 +02:00
VESSILLER
7bba9db2f0
FIX replace filter parameter "none" by "restricthtml"
2020-06-08 11:28:05 +02:00
Laurent Destailleur
c41e4d9b15
Fix page disabled
2020-06-07 23:25:12 +02:00
Laurent Destailleur
6ec2ff01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/website/index.php
2020-06-07 23:15:13 +02:00
Laurent Destailleur
f7563818ac
css
2020-06-07 23:12:56 +02:00
Laurent Destailleur
7ce7905d31
Fix check for mrp
2020-06-07 23:03:58 +02:00
Laurent Destailleur
87a60a501f
Security on disabling a web page
2020-06-07 23:00:38 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
9f8a3916c2
FIX #14051 #14052
2020-06-07 19:37:42 +02:00
Laurent Destailleur
09047dc19c
Doc
2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e
Fix lang property on database menu entry was not propagated
2020-06-07 19:25:25 +02:00
Laurent Destailleur
5e6ce8ea70
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-07 18:59:57 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
2a1d547267
Celan dead code
2020-06-07 18:44:37 +02:00
Laurent Destailleur
4020d97362
FIX Can create a credit note on situation invoice if previous is also
...
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
ptibogxiv
37007d6d1a
Update subscription.class.php
2020-06-07 16:12:28 +02:00
Marc Guenneugues
bd12972d7b
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-07 14:14:11 +02:00
Vaadasch
7b53ee2a6f
Update byratecountry.php
...
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
e17818c3dd
Merge pull request #14048 from simicar29/11.0-replenish
...
replenish : select expedition quantities only from opened orders when…
2020-06-07 14:12:38 +02:00
Laurent Destailleur
42d44e996f
Fix link to setup page
2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5
Fix link to setup page
2020-06-07 13:49:49 +02:00
Laurent Destailleur
04f68d25cd
css
2020-06-07 01:34:26 +02:00
Laurent Destailleur
4169aa716c
FIX can install module even if (x) was appended during download.
2020-06-07 00:23:20 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
115b827115
Prepare v12
2020-06-06 22:52:36 +02:00
Laurent Destailleur
e9a0b0c290
Merge pull request #14029 from atm-maxime/fix_user_validator_test
...
Fix missing test on module enabled for user validators
2020-06-06 22:23:30 +02:00
Laurent Destailleur
30ea9a497d
Merge pull request #14030 from atm-maxime/fix_contact_update_socialnetworks
...
Fix #14027 : emptying social network value on contact wasn't working
2020-06-06 21:57:32 +02:00
Laurent Destailleur
b221c65165
Merge
2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php
2020-06-06 21:47:27 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php
2020-06-06 21:45:53 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php
2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php
2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php
2020-06-06 21:37:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php
2020-06-06 21:32:25 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php
2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
...
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php
2020-06-06 21:23:35 +02:00
Laurent Destailleur
cd8dd236f4
Merge pull request #14028 from aspangaro/10.0_p38
...
FIX: Show ref_customer, amount on contract link object
2020-06-06 21:22:11 +02:00
Laurent Destailleur
a5b74189e6
Merge pull request #14031 from atm-florianm/10.0_FIX_copy_payment_value_date_on_account_line
...
FIX: copy value date of VariousPayment onto the new AccountLine
2020-06-06 21:19:11 +02:00
Laurent Destailleur
f30b522ab6
Merge pull request #14035 from OPEN-DSI/new-takepos-terminal-free-text
...
NEW add free text on each terminal of cash desk
2020-06-06 21:10:56 +02:00
Laurent Destailleur
f19064abfa
Merge pull request #14044 from dolibit-ut/patch-29
...
create index.html
2020-06-06 21:08:11 +02:00
Laurent Destailleur
4e4e7a38c3
Merge pull request #14041 from bb2a/VCARD
...
NEW add vcard for aderent and user
2020-06-06 20:58:37 +02:00
Laurent Destailleur
233810d41d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:37:36 +02:00
Laurent Destailleur
123265bf4c
Fix redirect url in multilang
2020-06-06 20:37:17 +02:00
Laurent Destailleur
148bdec96f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:25:24 +02:00
Laurent Destailleur
fb02edf254
Fix For select language component, we force on root
2020-06-06 20:25:05 +02:00
Laurent Destailleur
788ec1f87d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:18:51 +02:00
Laurent Destailleur
34778937c3
Fix link to image
2020-06-06 20:16:07 +02:00
Laurent Destailleur
f00b2d1e6f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 20:11:57 +02:00
Laurent Destailleur
2d87da8815
Fix link
2020-06-06 20:11:01 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
7061e9b4cb
Fix deletion of website page
2020-06-06 18:57:24 +02:00
Laurent Destailleur
e31e889595
Add url in error message
2020-06-06 18:30:04 +02:00
florian HENRY
0943b13ecc
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-06 17:51:31 +02:00
Laurent Destailleur
36bc266d67
css
2020-06-06 17:33:26 +02:00
Laurent Destailleur
3197f717c3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 17:12:58 +02:00
Laurent Destailleur
dd5b5e9bbf
Fix lang suggested in clone of page
2020-06-06 17:12:37 +02:00
Laurent Destailleur
5669eb81af
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 15:39:50 +02:00
Laurent Destailleur
919cc0da87
Fix num payment
2020-06-06 15:39:18 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Marc Guenneugues
cefc8dcca2
replenish : select expedition quantities only from opened orders when using virtual stocks
2020-06-06 11:39:49 +02:00
Laurent Destailleur
5dd9f4e4c4
Fix travis false positive
2020-06-06 11:36:24 +02:00
UT from dolibit
38b359392a
create index.html
2020-06-06 02:06:55 +02:00
Laurent Destailleur
2344435416
Fix XSS CWE-ID CWE-79
2020-06-05 23:41:29 +02:00
Laurent Destailleur
a59961dae6
Fix td alignment
2020-06-05 23:06:59 +02:00
Anthony Berton
ee10c6f10b
vcard
2020-06-05 17:57:13 +02:00
Laurent Destailleur
4fcaaa3387
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-06-05 17:48:02 +02:00
Laurent Destailleur
ca3f62e4ac
Doc repair Row size too large
2020-06-05 17:47:52 +02:00
Alexandre SPANGARO
e5f8f38fbf
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
2020-06-05 17:24:59 +02:00
VESSILLER
81fbb80823
FIX end div for responsive table
2020-06-05 14:20:38 +02:00
Laurent Destailleur
d252248319
Fix back to link in ECM menu
...
Fix picto in search_page
2020-06-05 13:41:33 +02:00
VESSILLER
ded7b79a6f
FIX free text on cash desk
2020-06-05 12:10:03 +02:00
VESSILLER
304c44560d
NEW add free text on each terminal of cash desk
2020-06-05 10:47:45 +02:00
Laurent Destailleur
b75700cc0b
Fix virtualstock activation when MRP module is on
2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c
css
2020-06-05 02:22:16 +02:00
florian HENRY
699557adbe
forget[]
2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737
forget[]
2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a
Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0
2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c
fix comment
2020-06-04 20:20:43 +02:00
florian HENRY
9a3e68b594
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Laurent Destailleur
c7a614bd50
Fix clean data
2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql
2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql
2020-06-04 16:46:36 +02:00
Florian Mortgat
c393f8149c
FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
2020-06-04 11:29:51 +02:00
Alexandre SPANGARO
ede084a111
Fix stickler
2020-06-04 05:11:00 +02:00
Maxime Kohlhaas
f6e0ed08e2
Fix #14027 : emptying social network value on contact wasn't working
2020-06-04 00:30:17 +02:00
Maxime Kohlhaas
e19f496d62
Fix missing test on module enabled for user validators
2020-06-03 23:30:06 +02:00
Alexandre SPANGARO
9e5c7d0acf
FIX: Show ref_customer, amount on contract link object
2020-06-03 23:00:53 +02:00
Laurent Destailleur
bd56210e97
doc
2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09
Add json-ld structure 'qa'
2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb
Fix cancel in media filemanager
2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c
Fix cancel in media filemanager
2020-06-03 12:39:00 +02:00
Laurent Destailleur
ae3d786593
Fix crop on media file manager
...
Conflicts:
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/photos_resize.php
htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc
Fix cancel in media filemanager
2020-06-03 12:34:09 +02:00
Laurent Destailleur
66df7fca41
Fix cancel in media filemanager
2020-06-03 11:40:51 +02:00
Laurent Destailleur
8894570054
Fix crop on media file manager
2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:06:27 +02:00
Laurent Destailleur
2965dda815
Typo
2020-06-03 01:02:48 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
Laurent Destailleur
71cb17b58b
css
2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b
css
2020-06-02 20:58:18 +02:00
Laurent Destailleur
9e6bb6f784
Sanitize params
2020-06-02 20:19:45 +02:00
Laurent Destailleur
a2287b3061
Trans
2020-06-02 20:19:14 +02:00
gauthier
68bb552dcc
FIX : Tickets mail models doesn't work
2020-06-02 17:06:49 +02:00
Laurent Destailleur
054d5c5f4c
css
2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e
Fix language key and css
2020-06-02 15:30:07 +02:00
Laurent Destailleur
658e7a2f87
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-02 13:32:02 +02:00
Laurent Destailleur
9651b5a7c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/product/class/html.formproduct.class.php
2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php
2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php
2020-06-02 12:12:07 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php
2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0
Fix line heiht overflow for blochet template
...
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
2020-06-02 11:17:37 +02:00
atm-lena
ae9c490134
Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses
2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e
Movement of hook "selectwarehouse"
2020-06-02 09:53:30 +02:00
Laurent Destailleur
cd4c161ca7
Merge pull request #14005 from bafbes/abb110214
...
Fix:To get translated, the key need to be one single word
2020-06-01 21:09:53 +02:00
Laurent Destailleur
9a6b2f9dd7
Merge pull request #14004 from bafbes/abb110213
...
new:DEFAULT_WAREHOUSE to define default in warehouse selections
2020-06-01 21:05:48 +02:00
Laurent Destailleur
ebc65f7df7
Update stockcorrection.tpl.php
2020-06-01 21:05:32 +02:00
Laurent Destailleur
6ddabd51c0
Update commonobject.class.php
2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf
fix:le résultat de explode est troujours un array
2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217
...
fix:the result of explode is always an array
2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php
2020-06-01 21:02:05 +02:00
bahfir abbes
cb551cfd5a
fix:non editable fields must not be editable in creation either
2020-06-01 20:58:20 +02:00
Laurent Destailleur
56e5a3dae6
Merge pull request #14009 from bafbes/abb110218
...
fix:non editable fields must not be editable in creation either
2020-06-01 20:57:55 +02:00
Laurent Destailleur
bdeee9ea99
Merge pull request #14007 from bafbes/abb110216
...
fix:replace some bd field types by their correspondant field type
2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae
Update index.php
2020-06-01 20:54:24 +02:00
Laurent Destailleur
0f5eed60a2
Update commonobject.class.php
2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752
fix:bad database quotation for booleans
2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220
...
fix:bad database quotation for booleans
2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php
2020-06-01 20:39:49 +02:00
Laurent Destailleur
33859bac2c
Merge pull request #14012 from andreubisquerra/master
...
TakePOS QR customer menu
2020-06-01 20:37:29 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342
...
FIX php error
2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222
...
fix:this is required to navigate by id
2020-06-01 20:15:48 +02:00
Laurent Destailleur
0362d28cf7
Update commonobject.class.php
2020-06-01 20:13:27 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0
...
Fix QR and add QR customer menu
2020-06-01 20:07:21 +02:00
andreubisquerra
b0f904508a
Fix travis
2020-06-01 17:52:38 +02:00
Florian Mortgat
3213148d87
FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message
2020-06-01 17:12:02 +02:00
andreubisquerra
8abe60db0b
Add Restaurant QR menu
2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887
Update QR
2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517
Update settings
2020-06-01 17:02:11 +02:00
andreubisquerra
c60982ce60
Update langs
2020-06-01 16:58:05 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89
Fix perms
2020-06-01 16:46:11 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
Laurent Destailleur
b648f30482
Fix perms
2020-06-01 14:52:26 +02:00
Laurent Destailleur
adb20c6a90
checkstyle
2020-06-01 12:36:09 +02:00
Laurent Destailleur
c4d8f0b6cc
css
2020-06-01 12:35:27 +02:00
florian HENRY
c655720b78
fix travis
2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-01 10:05:07 +02:00
Laurent Destailleur
c8d0476728
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908
Fix several troubles into numbering modules.
...
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5
Debug modulebuilder
2020-06-01 00:01:23 +02:00
Laurent Destailleur
4af17a342c
Doc
2020-06-01 00:00:24 +02:00
Laurent Destailleur
e83b754e6f
Debug modulebuilder
2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
28df07225d
Debug modulebuilder
2020-05-31 23:23:56 +02:00
Laurent Destailleur
3349144f5e
Fix lose enabled and default when editing field signatures in
...
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
67f007ea40
Fix length of field. Make some module die.
2020-05-31 23:12:26 +02:00
Laurent Destailleur
62dacfa713
Debug modulebuilder
2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c
Fix debug modulebuilder for doc and ref generation
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae
Fix debug modulebuilder for doc and ref generation
2020-05-31 22:59:33 +02:00
Laurent Destailleur
6e55abe831
Rename var to include "array" into name
2020-05-31 20:57:16 +02:00
ptibogxiv
a33f503a0d
FIX php error
...
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
2020-05-31 14:28:41 +02:00
Laurent Destailleur
b24c0e57a6
Fix transifex
2020-05-31 10:29:38 +02:00
bahfir abbes
f76c025a7b
fix:this is required to navigate by id
2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732
fix:bad database quotation for booleans
2020-05-31 01:41:04 +01:00
andreubisquerra
3ddce9f0df
Fix travis
2020-05-31 02:34:46 +02:00
bahfir abbes
26f280b74b
fix:non editable fields must not be editable in creation either
2020-05-31 01:33:34 +01:00
bahfir abbes
d6247bfc97
fix:le résultat de explode est troujours un array
2020-05-31 01:23:35 +01:00
stickler-ci
a5ed630a57
Fixing style errors.
2020-05-31 00:19:21 +00:00
jove@bisquerra.com
5f49586f12
TakePOS customer menu QR
2020-05-31 02:17:33 +02:00
bahfir abbes
fe52539787
fix:rempalcement de qqes valeurs de champs de BDDs par les valeurs adéquates
2020-05-31 01:14:44 +01:00
bahfir abbes
ef890a29eb
fix:Le label doit être une clé de dictionnaire
2020-05-31 01:10:27 +01:00
bahfir abbes
cf68317ae7
fix:Clé de langue dans les titres de menus
2020-05-31 00:56:51 +01:00
Bahfir Abbes
819984cfe0
replace with better normalized constant
2020-05-31 00:43:05 +01:00
stickler-ci
0813329070
Fixing style errors.
2020-05-30 23:39:16 +00:00
bahfir abbes
5873d41f64
Fix: DEFAULT_WAREHOUSE to define default in warehouse selections
2020-05-31 00:36:33 +01:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
6123596ec9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
8b03a5e225
Fix phpcs
2020-05-31 00:22:17 +02:00
Laurent Destailleur
94e02269ee
Fix: missing fk_project
2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba
FIX Missing ref into popup
2020-05-30 23:52:47 +02:00
Laurent Destailleur
90b9fd1461
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-30 23:51:13 +02:00
Laurent Destailleur
02bf646abe
FIX Missing ref into popup
2020-05-30 23:51:02 +02:00
Laurent Destailleur
e8016a5e7e
Fix credit-transfer vs direct debit
2020-05-30 23:46:14 +02:00
Laurent Destailleur
f191cec3ef
Merge pull request #13999 from OPEN-DSI/fix_erreur_facture
...
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:31 +02:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
Laurent Destailleur
52af430ae2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-30 14:20:16 +02:00
Laurent Destailleur
e223189507
FIX #14002
2020-05-30 14:20:04 +02:00
Laurent Destailleur
dfb5f02f4b
Fix token renewal
2020-05-30 02:40:05 +02:00
Laurent Destailleur
b61b8ee1fb
Fix token renewal
2020-05-30 02:27:10 +02:00
Laurent Destailleur
8146e4fdbd
Fix tooltip
2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e
Debug module Payment by credit transfer
2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8
Debug module Payment by credit transfer
2020-05-30 02:10:02 +02:00
Laurent Destailleur
f9ac4c2ada
Fix template
2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37
Fix template
2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4
Fix template
2020-05-30 01:17:23 +02:00
Laurent Destailleur
c4bbf12e72
Fix css
2020-05-30 00:58:11 +02:00
Laurent Destailleur
af3c24d0a9
Fix css
2020-05-30 00:56:51 +02:00
Laurent Destailleur
e2656ff2f8
Update template
2020-05-30 00:49:11 +02:00
Laurent Destailleur
0fd3292715
Fix show error message
2020-05-30 00:35:11 +02:00
Laurent Destailleur
926a9f68c4
Trans
2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4
css
2020-05-29 22:13:10 +02:00
Laurent Destailleur
7fc6917cfd
Debug feature of alternate languages
2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189
Debug feature of alternate languages
2020-05-29 21:59:33 +02:00
Laurent Destailleur
540a64bbba
Fix templates
2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4
Fix template
2020-05-29 21:48:27 +02:00
Laurent Destailleur
30aa50684f
Trans
2020-05-29 21:47:59 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
9d2f67bf8c
Trans
2020-05-29 16:35:01 +02:00
kamel
1e208e537f
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:24:07 +02:00
kamel
a4800f7b9b
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:18:27 +02:00
Laurent Destailleur
21c58e9fab
Error management
2020-05-29 15:29:47 +02:00
Laurent Destailleur
7f8c0d0e7a
Fix templates
2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c
Fix template
2020-05-29 15:13:16 +02:00
Laurent Destailleur
91f5f8053a
Fix label
2020-05-29 13:46:27 +02:00
Laurent Destailleur
ab82797dfc
var not defined
2020-05-29 13:20:33 +02:00
Laurent Destailleur
f38118790e
Trans
2020-05-29 12:18:47 +02:00
Laurent Destailleur
b9051bbe22
Fix admin report
2020-05-29 09:50:38 +02:00
Laurent Destailleur
b11ef125c3
FIX Force of HTML content only for ckeditor
...
Conflicts:
htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f
FIX Force of HTML content only for ckeditor
2020-05-29 03:26:05 +02:00
Laurent Destailleur
9224061aed
Fix test to upload a file
2020-05-29 03:20:44 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
bc9201b073
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 21:36:16 +02:00
Laurent Destailleur
3b22b6192d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 21:36:08 +02:00
Laurent Destailleur
60dfcdba00
Fix var type
2020-05-28 21:29:30 +02:00
Laurent Destailleur
46a362b7d8
doxygen
2020-05-28 21:25:47 +02:00
Laurent Destailleur
c1b4f7ec28
Fix phpcs
2020-05-28 21:24:46 +02:00
Laurent Destailleur
2e0cf05e55
phpcs
2020-05-28 21:20:30 +02:00
Laurent Destailleur
79c2d96375
Merge pull request #13679 from TobiasSekan/cleanupUserRightsSupplierProposalCard
...
Cleanup user rights on supplier proposal card
2020-05-28 21:12:37 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard
...
Cleanup user rights forun commande card
2020-05-28 21:12:23 +02:00
Laurent Destailleur
c7eb71e19e
Merge pull request #13676 from TobiasSekan/CleanupUserRightsForunFactureCard
...
Cleanup user rights on forun facture card
2020-05-28 21:11:58 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Laurent Destailleur
5cec3eb052
Prepare 12.0
2020-05-28 20:12:49 +02:00
Laurent Destailleur
6cbb87f224
FIX #13995 #13994 manually.
2020-05-28 20:12:06 +02:00
Laurent Destailleur
7fbacf4352
phpcs
2020-05-28 20:04:30 +02:00
Laurent Destailleur
1992b633ba
Fix phpcs
2020-05-28 20:02:07 +02:00
Laurent Destailleur
56d3a5ecf2
Fix look and feel v12
2020-05-28 19:43:12 +02:00
Laurent Destailleur
11aedcd71a
Fix look and feel v12
2020-05-28 19:42:10 +02:00
Laurent Destailleur
f8b92e507c
Clean code
2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse-
...
NEW Add option to define a default warehouse at user level
2020-05-28 18:41:54 +02:00
Laurent Destailleur
a92e952960
Merge branch 'NewVendorInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992
Merge branch 'NewCustomerInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:29:59 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991
...
Fix #13991
2020-05-28 18:27:39 +02:00
Laurent Destailleur
278f413a7a
Merge pull request #13980 from OPEN-DSI/new_save_filter_project_index
...
NEW Save filter of the project homepage
2020-05-28 18:26:26 +02:00
Supermanu
fd868b9d67
Fix compatibility with delete perm in massactions
2020-05-28 17:57:00 +02:00
Laurent Destailleur
c657fb41fb
Merge pull request #13987 from Supermanu/fix_old_perm
...
FIX compatibility with delete perm in massactions
2020-05-28 17:56:31 +02:00
Laurent Destailleur
7a8b61b125
Merge pull request #13986 from Supermanu/mass_action_deletion
...
NEW Add mass deletion for events
2020-05-28 17:52:05 +02:00
Laurent Destailleur
3883d73f20
Merge pull request #13970 from atm-quentin/FIX_missing_menu_accountancy_report
...
FIX missing accountancy report menu for simple accountancy conf
2020-05-28 17:51:06 +02:00
Laurent Destailleur
873b378852
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-28 17:50:27 +02:00
Laurent Destailleur
3ae61fcd73
Merge pull request #13981 from atm-florianm/11.0_FIX_pgsql_error_in_adherents_module
...
11.0 FIX postgreSQL error on landing page when "members" module is on
2020-05-28 17:50:08 +02:00
Laurent Destailleur
9d7a4cae00
Fix default value
2020-05-28 17:49:56 +02:00
Laurent Destailleur
f7e57da9f9
Merge pull request #13974 from andreubisquerra/12.0
...
Update to Auto Order last version in Dolibarr 12
2020-05-28 17:40:30 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php
2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php
2020-05-28 17:37:53 +02:00
Laurent Destailleur
f008338fde
Merge pull request #13990 from cfoellmann/fix-batch-delivery
...
fix #13988 - missing batch field extension
2020-05-28 17:32:30 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message
...
NEW Ticket message notifications when edited from public interface
2020-05-28 17:31:26 +02:00
stickler-ci
56259bae9a
Fixing style errors.
2020-05-28 14:18:00 +00:00
glu000
9915d97adf
Fix #13991
2020-05-28 16:11:02 +02:00
Christian Foellmann
50bac41399
fix #13988 - missing batch field extension
2020-05-28 15:19:48 +02:00
atm-lena
edc6abcea8
FIX Rounding Total TVA in "crabe" model pdf
2020-05-28 15:19:37 +02:00
Supermanu
e9d94c878b
Fix compatibility with delete perm in massactions
2020-05-28 14:56:20 +02:00
stickler-ci
029f5570e5
Fixing style errors.
2020-05-28 12:55:29 +00:00
Supermanu
0baea21947
NEW Add mass deletion for events
...
Only users with the right `allactions->delete` will be able to mass delete.
2020-05-28 14:45:54 +02:00
Laurent Destailleur
537b291fab
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
2020-05-28 12:24:55 +02:00
Laurent Destailleur
df5aead4f3
Merge pull request #13984 from Supermanu/agenda_date_picker
...
NEW Add calendar selection for agenda view
2020-05-28 12:20:37 +02:00
Laurent Destailleur
88475025af
Trans
2020-05-28 12:04:52 +02:00
Laurent Destailleur
2afcfa8463
Fix missing stat on products
2020-05-28 12:01:19 +02:00
Laurent Destailleur
1838cf92ef
Look and feel v12
2020-05-28 11:51:49 +02:00
