stickler-ci
5dcd5e5b87
Fixing style errors.
2020-02-03 09:54:35 +01:00
AdrianDominik
ed269a387f
FIX : #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
2020-02-03 09:54:34 +01:00
AdrianDominik
ad2e10a679
FIX : #12908 User login with credentials from self-subscription form fails
2020-02-03 09:54:34 +01:00
stickler-ci
478f927df3
Fixing style errors.
2020-02-03 09:54:34 +01:00
AdrianDominik
540e82102b
FIX : #12908 User login with credentials from self-subscription form fails
2020-02-03 09:54:34 +01:00
Laurent Destailleur
2cb414e17e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:35:27 +01:00
Laurent Destailleur
2813c9d4b4
FIX #12973
2020-02-03 06:31:40 +01:00
Laurent Destailleur
87f84e5b17
FIX #12973
2020-02-03 06:29:40 +01:00
Laurent Destailleur
d8ed62ea33
Fix line_max for BOM
2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335
FIX #12995
2020-02-03 04:48:17 +01:00
Laurent Destailleur
7c35e9aaa8
FIX #12932
2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a
FIX #12932
2020-02-03 03:55:37 +01:00
Laurent Destailleur
b3a50bd4b0
FIX #12874
2020-02-03 03:47:45 +01:00
Laurent Destailleur
a30da7860f
FIX #12892
2020-02-03 03:32:31 +01:00
Laurent Destailleur
5633f58477
FIX #12978
2020-02-03 03:25:41 +01:00
Laurent Destailleur
ccf8e81f93
FIX #12975
2020-02-03 03:10:10 +01:00
Laurent Destailleur
ff6bcbdcf8
Fix trans
2020-02-03 03:10:03 +01:00
Laurent Destailleur
5e4e02337b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-02-03 02:50:44 +01:00
Laurent Destailleur
90cde17bdb
FIX #12986
2020-02-03 02:48:05 +01:00
Laurent Destailleur
69a0a1410e
FIX #12991
2020-02-03 02:28:23 +01:00
Laurent Destailleur
a0e3c5292f
FIX #12992
2020-02-03 02:20:38 +01:00
Laurent Destailleur
6fda058497
Merge pull request #12959 from ptibogxiv/patch-298
...
FIX doc of dictionnary API
2020-02-02 20:27:42 +01:00
Laurent Destailleur
590f8bf738
Merge pull request #12988 from aspangaro/11.0_p4
...
FIX: FEC export have specific name
2020-02-02 20:24:21 +01:00
Laurent Destailleur
b632ebb52c
Merge pull request #12997 from atm-john/11.0_fix_project_loan_data
...
11.0 fix project loan data
2020-02-02 20:23:22 +01:00
Laurent Destailleur
7cb2c21dc2
FIX #12974
2020-02-02 19:50:53 +01:00
Laurent Destailleur
075b1ea744
FIX Log of authentication ko or ko + CVE-2020-7996
2020-02-02 19:05:38 +01:00
Laurent Destailleur
967d97ccd7
FIX CVE-2020-7994
2020-02-02 15:01:57 +01:00
Laurent Destailleur
bd322dc12e
Fix search on country
2020-02-02 12:59:11 +01:00
stickler-ci
01b1667eed
Fixing style errors.
2020-02-02 08:13:09 +00:00
ATM john
fe009c3842
Fix project profit for loan part
2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c
Fix project loan data
2020-02-02 06:36:06 +01:00
Laurent Destailleur
ec649bc0a3
Fix CSS
2020-02-01 10:09:31 +01:00
Alexandre SPANGARO
e8b9ca3276
FIX: FEC export have specific name
2020-02-01 08:23:19 +01:00
Alexandre SPANGARO
0229cd3c65
FIX: FEC export have specific name
2020-02-01 08:18:48 +01:00
Laurent Destailleur
aa54aaeb01
FIX search filter on extrafields were not restored avec "Back to list"
2020-01-31 19:46:03 +01:00
Laurent Destailleur
d530c7f708
Try fix for #12984
2020-01-31 18:57:07 +01:00
Laurent Destailleur
b83c90e348
Fix phpcs
2020-01-31 18:02:18 +01:00
Laurent Destailleur
9372940f17
Fix log through proxy
2020-01-31 17:51:30 +01:00
Laurent Destailleur
b81d223ab3
Do no retry ping after error the same month
2020-01-31 17:27:48 +01:00
Laurent Destailleur
8e18a08377
Fix log of proxy forward only if it differs from remote_addr
2020-01-31 16:59:10 +01:00
Laurent Destailleur
1c24bcc724
FIX CVE Need permission to be able to develop modules
2020-01-31 10:29:41 +01:00
Laurent Destailleur
d60ce8a2c3
Fix showoncombobox
2020-01-30 20:02:40 +01:00
ptibogxiv
8f2c87b0d4
Update api_setup.class.php
2020-01-30 13:52:13 +01:00
Laurent Destailleur
314456f812
Fix var not defined
2020-01-30 13:03:33 +01:00
Laurent Destailleur
141664ff10
Fix phpcs
2020-01-30 02:25:26 +01:00
Laurent Destailleur
1144b937eb
Fix phpcs
2020-01-29 23:34:54 +01:00
Laurent Destailleur
af61c19ffd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-29 23:06:21 +01:00
kadogo
b2610903a4
NEW enable put for agendaevents api
2020-01-29 22:55:44 +01:00
Michael Jeanmotte
f1f83656f1
Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259
2020-01-29 22:54:35 +01:00
Laurent Destailleur
f91bfdb7e1
Merge pull request #12969 from atm-florianm/FIX_11.0_modulebuilder_allow_zero_in_object_list_filters
...
FIX: '0' is a valid search value in object list filters
2020-01-29 22:47:58 +01:00
Laurent Destailleur
a1b787bc08
Merge pull request #12958 from altatof/sellang
...
FIX : default lang selection when filter
2020-01-29 22:46:10 +01:00
Laurent Destailleur
c4ee95154d
Merge pull request #12956 from altatof/fetch_account
...
FIX : fetching account on current entity
2020-01-29 22:41:43 +01:00
Laurent Destailleur
a9d917a3f0
Fix phpcs
2020-01-29 22:40:10 +01:00
Laurent Destailleur
0a221f66ea
Update template
2020-01-29 20:38:46 +01:00
Laurent Destailleur
633ba666aa
Add info of email reference syntax to help debug.
2020-01-29 19:26:04 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
Florian Mortgat
1e77ddbf11
FIX: '0' is a valid search value in object list filters
2020-01-29 17:52:22 +01:00
Laurent Destailleur
65e8113373
Look and feel v11
2020-01-29 14:23:44 +01:00
ptibogxiv
e31a93929a
FIX doc of dictionnary API
2020-01-29 14:01:48 +01:00
Laurent Destailleur
7c34d97e2d
Fix messages for SPF
2020-01-29 13:10:16 +01:00
altairis
f1ea0ce5a1
better fix
2020-01-29 11:47:23 +01:00
Laurent Destailleur
1e13f6fd0f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php
2020-01-29 11:44:04 +01:00
Laurent Destailleur
d650258d39
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-29 11:38:17 +01:00
Laurent Destailleur
5d2130a5ae
Fix SQL injection
2020-01-29 11:38:06 +01:00
altairis
3c3876eb59
FIX : default lang selection when filter
2020-01-29 11:32:24 +01:00
oscim
d224c711cf
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 11:07:30 +01:00
altairis
b04bb9e392
FIX : fetching account on current entity
2020-01-29 11:05:10 +01:00
Laurent Destailleur
e38069e41b
Merge pull request #12947 from ptibogxiv/patch-296
...
fix lang for other payment mode available
2020-01-28 20:39:59 +01:00
Laurent Destailleur
ed8b6f346d
Merge pull request #12946 from OPEN-DSI/v10-fix-categorie-full-arbo-match
...
FIX regex for include or exclude categories in full arbo
2020-01-28 20:39:22 +01:00
Laurent Destailleur
4730da94ab
Merge pull request #12943 from OPEN-DSI/v10-fix-extrafiled-category-require
...
FIX require category class in extrafield
2020-01-28 20:37:35 +01:00
Laurent Destailleur
be9d27d430
Merge pull request #12944 from gti-eu/11.0
...
Fix mailcollector text format
2020-01-28 20:37:07 +01:00
Laurent Destailleur
b2256620c4
Update emailcollector.class.php
2020-01-28 20:36:28 +01:00
Laurent Destailleur
9ae174d8b4
Clean code
2020-01-28 19:47:21 +01:00
Laurent Destailleur
c87fdc96ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
782be2ac37
FIX Invert isSellerInEEC and isBuyerInEEC
2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6
FIX The "automatic bind" was linked EEC to export accountancy code
...
Conflicts:
htdocs/accountancy/supplier/index.php
2020-01-28 17:48:34 +01:00
Laurent Destailleur
e9de1e16e8
FIX The "automatic bind" was linked EEC to export accountancy code
2020-01-28 17:44:05 +01:00
ptibogxiv
5783f9b7c2
fix lang for other payment mode available
2020-01-28 17:33:50 +01:00
Laurent Destailleur
f5ce0fc811
Fix seach on country
2020-01-28 17:22:26 +01:00
VESSILLER
8af5d87e80
FIX regex for include or exclude categories in full arbo
2020-01-28 17:13:09 +01:00
gti-eu
c169632f7b
Add missing doc
2020-01-28 14:24:42 +01:00
stickler-ci
8a9ca97b45
Fixing style errors.
2020-01-28 12:26:59 +00:00
gti-eu
e770b503e5
Fix mailcollector text format
2020-01-28 13:23:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
471e1d71a0
Fix send remind by email
2020-01-28 11:38:27 +01:00
VESSILLER
7cdd334995
FIX require category class in extrafield
2020-01-28 11:37:23 +01:00
Laurent Destailleur
b96650b541
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-28 11:04:53 +01:00
Laurent Destailleur
24eb584d50
Doc
2020-01-28 11:04:41 +01:00
Laurent Destailleur
751247d3f3
Merge pull request #12935 from mapiolca/patch-24
...
Fix link direction for late supplier invoices
2020-01-28 02:59:25 +01:00
Laurent Destailleur
72f719382c
Merge pull request #12939 from ptibogxiv/patch-295
...
fix list stripe charge.php
2020-01-28 02:52:01 +01:00
Laurent Destailleur
f64ad71924
Missing country code
2020-01-28 02:50:11 +01:00
Laurent Destailleur
c2c80bf40f
Fix Look and feel v11
2020-01-28 02:44:41 +01:00
Laurent Destailleur
fc63d7366d
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:23:40 +01:00
Laurent Destailleur
a02a2a6def
Sync transifex
2020-01-27 16:07:53 +01:00
ptibogxiv
63d9e3c01e
fix list stripe charge.php
...
payment intent use table_element so need double terms for more compatibility
2020-01-27 15:11:22 +01:00
Laurent Destailleur
5feea89a94
Fix responsive for public interface
2020-01-27 14:11:40 +01:00
Laurent Destailleur
29853b5fbd
Fix responsive for public interface of tickets
2020-01-27 14:01:35 +01:00
Laurent Destailleur
90d255d3c4
Look and feel v11
2020-01-27 13:43:03 +01:00
Laurent Destailleur
c103ff58cf
FIX update of llx_societe_account for stripe customer key.
2020-01-27 12:41:22 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices
...
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Pierre Ardoin
e0c8fce229
Fix link direction for late supplier invoices
...
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.
2020-01-27 09:39:38 +01:00
Laurent Destailleur
89e9b9391b
Fix responsive
2020-01-27 02:26:07 +01:00
Laurent Destailleur
7438f92912
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
6744fc4279
Fix takepos permissions
2020-01-27 00:38:28 +01:00
Laurent Destailleur
ecaacc9543
FIX #12875
2020-01-26 23:27:47 +01:00
Laurent Destailleur
69ce8b543e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-26 23:22:59 +01:00
Laurent Destailleur
d13e5bc90b
FIX #12875
2020-01-26 23:22:47 +01:00
Laurent Destailleur
2e7c615e80
Merge pull request #12928 from atm-greg/FIX_10.0_date_filters_on_contract_service_list
...
FIX date filter not used if no operator
2020-01-26 22:33:42 +01:00
Laurent Destailleur
64fab28648
Merge pull request #12926 from atm-greg/FIX_10.0_form_reload_on_country_id_change
...
fix lost name_alias on country selection
2020-01-26 22:33:12 +01:00
Laurent Destailleur
57bbe66612
Merge pull request #12929 from atm-gauthier/10.0_orderby_extrafieldsinexport
...
FIX : Extrafield position in export field list must respect "pos" field
2020-01-26 22:30:02 +01:00
Laurent Destailleur
7e98414e3e
Merge pull request #12915 from gti-eu/11.0
...
Fix reference check on emailcollector
2020-01-26 22:29:15 +01:00
Laurent Destailleur
cf6b9f7d03
Merge pull request #12918 from atm-florian/11_fixWithdrwLineList
...
fix SEPA lines with limit select and working pagination
2020-01-26 22:25:01 +01:00
Laurent Destailleur
ae087d665c
Merge pull request #12916 from RubenRuCh/11.0
...
Fix: strict mode mysql compatibility
2020-01-26 22:24:25 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination
...
10 fix create sepa limit and pagination
2020-01-26 22:24:11 +01:00
Laurent Destailleur
08841d4475
Update receipt.php
2020-01-26 22:14:31 +01:00
Laurent Destailleur
eff9fae261
Update receipt.php
2020-01-26 22:14:27 +01:00
javierybar
cb0986db8b
TakePOS price rounding
2020-01-26 22:14:11 +01:00
Laurent Destailleur
be29795f7f
Merge pull request #12905 from laudeco/hotfix/qty_negative_stock
...
fix minimum quantity on stock movement
2020-01-26 22:09:43 +01:00
Laurent Destailleur
68f5aee432
Fix global stats for holiday
2020-01-26 19:38:19 +01:00
Laurent Destailleur
4510ef488e
doc modulebuilder
2020-01-25 22:43:56 +01:00
Laurent Destailleur
12556aa835
Fix modulebuilder
2020-01-25 19:21:37 +01:00
Laurent Destailleur
9ecf6127c6
Add array fields for contracts
2020-01-25 19:02:36 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue
...
fixes an issue that displayed the "restricted area" banner despite user permissions.
2020-01-25 15:19:46 +01:00
Laurent Destailleur
f2771b3365
FIX #12896
2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
de6b30be8c
Look and feel v11
2020-01-25 13:06:10 +01:00
Laurent Destailleur
09e707b818
trans
2020-01-25 13:05:40 +01:00
Laurent Destailleur
be70232bfe
Clean code
2020-01-25 12:10:00 +01:00
Laurent Destailleur
cc6b9269f9
Fix look and feel v11
2020-01-25 11:50:16 +01:00
Laurent Destailleur
c494e3029b
Trans
2020-01-24 20:14:01 +01:00
Laurent Destailleur
8f3f34e1c0
Fix css
2020-01-24 20:11:07 +01:00
Laurent Destailleur
d5f2a793c0
CSS
2020-01-24 19:36:17 +01:00
Laurent Destailleur
3a7c0b63f1
css
2020-01-24 17:56:41 +01:00
Laurent Destailleur
5d7fa55759
css
2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65
Update logos
2020-01-24 17:30:46 +01:00
Laurent Destailleur
209ebfbe2f
Fix trans
2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae
Debug cashfence feature
2020-01-24 15:59:36 +01:00
gauthier
4222639702
FIX : Extrafield position in export field list must respect "pos" field
2020-01-24 15:32:59 +01:00
Laurent Destailleur
779cd94b0e
Debug cashfence feature
2020-01-24 15:26:18 +01:00
atm-greg
f63893a90c
FIX date filter not used if no operator
2020-01-24 15:10:57 +01:00
Laurent Destailleur
17f28189f9
Virtual stock must include Manufacturing Orders
2020-01-24 14:51:45 +01:00
atm-greg
f5395fa859
fix lost name_alias on country selection
2020-01-24 14:28:08 +01:00
florian HENRY
2f0144b19b
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList
2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9
add hook into withdraw list
2020-01-24 13:22:04 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
e1123c63a9
Fix field label
2020-01-23 19:42:00 +01:00
Laurent Destailleur
b74d37338b
Fix trans
2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64
Fix label
2020-01-23 19:32:34 +01:00
Laurent Destailleur
423be8a139
FIX Label of status of social contribution
2020-01-23 19:30:02 +01:00
florian HENRY
62caf3cbfc
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:45:16 +01:00
Laurent Destailleur
b3bbb23dae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f
FIX Error in log for email sending with smtps was not complete
2020-01-23 17:30:05 +01:00
florian HENRY
fd0daad959
fix SEPA line with limit select and working pagination
2020-01-23 16:49:06 +01:00
AdrianDominik
d302f190a7
Fix: strict mode mysql compatibility
2020-01-23 13:29:28 +01:00
gti-eu
67e57b8da2
Add trackid to Ticket message mail
2020-01-23 12:53:24 +01:00
Laurent Destailleur
7ad827f212
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php
2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php
2020-01-23 12:02:29 +01:00
Laurent Destailleur
646ccc1354
Fix error management
2020-01-23 11:52:00 +01:00
gti-eu
40febd2781
Fix reference check on emailcollector
...
ObjectType is on reg[1]
ObjectId is on reg[2]
2020-01-23 11:48:44 +01:00
Alexandre SPANGARO
7f47b48559
Move function to functions2.lib.php
2020-01-23 11:47:30 +01:00
Laurent Destailleur
8a55b4d82e
Merge pull request #12912 from laudeco/hotfix/stock_movement_date_as_integer
...
FIX - API - DLC/DLUO date for stock movement
2020-01-23 11:37:31 +01:00
Laurent Destailleur
fa305a1471
Update box_factures_imp.php
2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741
Fix: strict mode mysql compatibility
2020-01-23 10:47:52 +01:00
Laurent De Coninck
7ec17f17d5
FIX - API - DLC/DLUO date for stock movement
...
Instead of giving a string to the creation of a stock movement, we have
to give an integer.
This PR fixes that.
[see: X]
2020-01-23 09:41:22 +01:00
Alexandre SPANGARO
5eeef771fa
FIX: FEC export format
2020-01-23 06:20:31 +01:00
Laurent Destailleur
553107258e
Fix alignement
2020-01-22 17:00:54 +01:00
Laurent Destailleur
040f8bef5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee
Fix typo
2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674
FIX Check on unicity on prof id was not triggered sometimes
2020-01-22 16:22:53 +01:00
Laurent Destailleur
28d0b85b84
Fix phpcs
2020-01-22 14:56:19 +01:00
Laurent Destailleur
25665daa40
FIX #11957
2020-01-22 14:53:40 +01:00
Laurent Destailleur
2caa4e9fa6
Merge pull request #12885 from leninrivas/10.0
...
FIX Missing Linked objects Fichinter Ref. in PDF formats
2020-01-22 14:17:25 +01:00
Laurent Destailleur
bfc8369418
Fix phpcs
2020-01-22 14:15:08 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
cb41168904
Merge pull request #12889 from mapiolca/patch-21
...
Fix double display of create credit note button
2020-01-22 13:57:47 +01:00
Laurent Destailleur
0c4e736e13
Merge pull request #12893 from aspangaro/10.0_p33
...
Fix : Accounting - error on right
2020-01-22 13:54:45 +01:00
Laurent Destailleur
d141d9516b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-22 13:53:31 +01:00
Laurent Destailleur
fc894d7a20
Fix for stripe connect
2020-01-22 13:53:20 +01:00
Laurent Destailleur
3d474d5174
Merge pull request #12902 from ptibogxiv/patch-293
...
fix stripe/charge.php for connect mode with payment intent
2020-01-22 13:53:04 +01:00
Laurent Destailleur
999e363446
Update charge.php
2020-01-22 13:52:37 +01:00
Laurent Destailleur
3bd4580e9b
Merge pull request #12904 from OPEN-DSI/v10-product-unit-length-update
...
FIX length, width and height units coherence in product table
2020-01-22 13:48:18 +01:00
Laurent Destailleur
e96ef17737
Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param
...
FIX dom and missing param
2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php
2020-01-22 13:44:42 +01:00
Laurent Destailleur
0456994f0d
Responsive
2020-01-22 13:34:21 +01:00
Laurent Destailleur
d87419f3db
FIX #11957
2020-01-22 13:34:07 +01:00
Laurent Destailleur
13a9a22cc5
Fix responsive demo
2020-01-22 13:02:50 +01:00
Laurent Destailleur
de99426247
Fix MRP
2020-01-22 12:53:51 +01:00
Laurent Destailleur
0c666ee73b
Fix reponsive
2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9
Fix reponsive
2020-01-22 12:44:10 +01:00
Laurent De Coninck
73ee655dde
fix minimum quantity on stock movement
...
by fixing another issue on the batch management in the API, I introduced
a bug on the stock quantity decrease.
[see: X]
2020-01-22 08:13:00 +01:00
Laurent Destailleur
69fae5a679
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:38:03 +01:00
Laurent Destailleur
8f1737952d
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5
Fix filter on parent account in list of accounting accounts
2020-01-21 21:36:40 +01:00
Laurent Destailleur
fd02ed4317
Fix label
2020-01-21 20:50:58 +01:00
VESSILLER
c91ab621b8
FIX length, width and height coherence in product table
2020-01-21 17:49:27 +01:00
Laurent Destailleur
4922567a27
Add .noexec extension for old php4, php5... files
2020-01-21 15:02:04 +01:00
John Botella
d6766af35d
Fix dom and missing param
2020-01-21 14:17:53 +01:00
Laurent Destailleur
6d50cc1899
Update demo profiles
2020-01-21 13:25:38 +01:00
Laurent Destailleur
4773c81ae1
Fix demo profiles
2020-01-21 13:01:49 +01:00
Laurent Destailleur
ca3e6ff60c
Doc
2020-01-21 12:46:28 +01:00
Laurent Destailleur
49e875aa96
Fix fatal error
2020-01-21 12:21:37 +01:00
Laurent Destailleur
151a978105
Debug loan module
2020-01-21 11:25:51 +01:00
ptibogxiv
b4758295e1
fix stripe/charge.php for connect mode with payment intent
2020-01-21 10:59:57 +01:00
Laurent Destailleur
dc1600b3c2
Fix responsive
2020-01-21 10:54:31 +01:00
Laurent Destailleur
54a0d97891
Fix responsive
2020-01-21 10:48:15 +01:00
Laurent Destailleur
f2ed97dada
Fix default value
2020-01-21 10:29:41 +01:00
Laurent Destailleur
c203e21966
Fix default values
2020-01-21 10:28:42 +01:00
Laurent Destailleur
ab5940f28c
Fix css lost
2020-01-21 00:56:32 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
d2cf4c55ee
Fix label of status
2020-01-20 23:58:01 +01:00
Laurent Destailleur
5cac54b2e1
Doc
2020-01-20 18:46:13 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Laurent Destailleur
d465101ae3
Fix We should not be able to choose which permission to use to have
...
access to an object.
2020-01-20 14:29:02 +01:00
Laurent Destailleur
60fd1f5156
Fix bad entry in menu
2020-01-20 12:47:49 +01:00
Laurent Destailleur
5f64531e9b
Fix look and feel v11
2020-01-20 12:39:25 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
969da828fa
Debug inventory
2020-01-20 02:30:53 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +01:00
Alexandre SPANGARO
f4cd3236b1
Fix : Accounting - error on right
2020-01-19 21:59:01 +01:00
Laurent Destailleur
62b9fbb67f
Fix link
2020-01-19 20:33:55 +01:00
Laurent Destailleur
5a702eb50c
Fix filter on amount
2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b
Fix search
2020-01-19 19:51:40 +01:00
Laurent Destailleur
19ab802aaf
Fix disabling of balance
2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f
Fix link
2020-01-19 19:33:57 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button
...
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
2020-01-19 19:10:10 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46
FIX XSS vulnerability in description of list of audit events.
2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b
FIX XSS vulnerability in description of list of audit events.
2020-01-19 18:51:37 +01:00
Laurent Destailleur
8c8d492a48
FIX Protection to avoid blocking situation with negative lines
2020-01-19 15:19:07 +01:00
Laurent Destailleur
00cddc39fd
Fix remove some orphelins in llx_ecm_files
2020-01-19 13:56:16 +01:00
Laurent Destailleur
8bc8a8f57c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-19 12:16:33 +01:00
Laurent Destailleur
f4ae869678
Fix error return when creating order with not enough stock
2020-01-19 12:15:47 +01:00
andreubisquerra
83d1b673bb
Visible receipt printer settings without stock module in TakePOS
2020-01-18 20:22:54 +01:00
Laurent Destailleur
45f322cce8
Fix error management in API
2020-01-18 20:17:21 +01:00
Laurent Destailleur
a1b03e094c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-18 19:53:58 +01:00
Laurent Destailleur
d9f7c4aec4
FIX #12838
2020-01-18 19:53:48 +01:00
Laurent Destailleur
df26bab65b
FIX #12881
2020-01-18 19:52:59 +01:00
Laurent Destailleur
6edc22c1ad
Merge pull request #12884 from laudeco/hotfix/#12883_dlc_dluo_api
...
#12883 - DLC and DLUO in the stock movement api
2020-01-18 19:40:30 +01:00
Laurent Destailleur
3748da6ee3
Merge pull request #12882 from simnandez/11.0
...
FIX In third parties creation, when changing the country drop down, the states are not reloaded
2020-01-18 19:37:29 +01:00
Laurent Destailleur
0873f2fec9
Fix $user not defined
2020-01-18 16:16:17 +01:00
Laurent De Coninck
d2e4b9346b
enhance the doc
2020-01-17 17:49:50 +01:00
Laurent De Coninck
5687d26f95
fixes the creation of a stock movement
...
This fixes the creation of a stock movement by supporting the DLC and
DLUO.
[see: #12883 ]
2020-01-17 17:21:14 +01:00
Juanjo Menent
057a40dcb2
FIX: In third parties creation, when changing the country drop down, the states are not recharged
2020-01-17 17:05:29 +01:00
Laurent Destailleur
0ebed529e1
FIX #12872
2020-01-17 15:27:43 +01:00
Laurent Destailleur
81f8a486c9
Look and feel v11
2020-01-17 14:56:06 +01:00
Laurent Destailleur
cf2001a1ae
Merge pull request #12860 from atm-ph/fix_10.0_html_text
...
Fix note started with <s> balise
2020-01-17 14:51:09 +01:00
Laurent Destailleur
82deccea08
Fix bad link
2020-01-17 14:41:42 +01:00
Laurent Destailleur
fe6bcd8a31
Fix missing value in popup
2020-01-17 14:32:22 +01:00
Laurent Destailleur
b48c9a5998
Update website templates
2020-01-17 14:09:29 +01:00
VESSILLER
60d4f63205
FIX send expense report mail in HTML format
2020-01-17 13:56:01 +01:00
Laurent Destailleur
ab8078689f
Trans
2020-01-17 13:31:40 +01:00
Laurent Destailleur
26e450fb2a
Fix extension of backup file
2020-01-17 11:52:21 +01:00
Laurent Destailleur
2099e05f22
Fix translation
2020-01-17 11:39:22 +01:00
Laurent Destailleur
d5d068e3d5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-17 11:34:43 +01:00
Laurent Destailleur
906110dc1d
Fix backup. Recommended compression is gzip.
2020-01-17 11:34:31 +01:00
Laurent Destailleur
85c1d31340
Merge pull request #12866 from RubenRuCh/11.0
...
FIX: add traslate from remains holidays
2020-01-16 23:08:22 +01:00
Laurent Destailleur
48f109a6a4
Merge pull request #12868 from bb2a/patch-12
...
Update functions.lib.php
2020-01-16 23:07:17 +01:00
Laurent Destailleur
a8fd6f56ea
Look and feel v11
2020-01-16 18:12:52 +01:00
Laurent Destailleur
1d058e8707
Fix look and feel v11
2020-01-16 18:09:29 +01:00
Laurent Destailleur
76e7c147b3
Look and feel v11
2020-01-16 18:03:57 +01:00
Anthony Berton
9a6ee89d43
Update functions.lib.php
2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683
Update functions.lib.php
2020-01-16 15:20:09 +01:00
Laurent Destailleur
6318f21a8f
Trans
2020-01-16 15:07:18 +01:00
AdrianDominik
5fb15ff0f8
FIX: add traslate from remains holidays
2020-01-16 14:01:41 +01:00
Laurent Destailleur
d7423c23de
Doc
2020-01-16 12:34:53 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
atm-ph
3cdb84b192
Fix note started with <s> balise
2020-01-16 09:50:57 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
1de62b1f44
Doc
2020-01-15 21:50:11 +01:00
Laurent Destailleur
d708fcac5e
Fix deploy module
2020-01-15 21:49:17 +01:00
Norbert Penel
3c2dd7db7c
Fix modulbuilder create forms
...
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
2020-01-15 20:11:34 +01:00
Laurent Destailleur
a68da82bec
Code comment of export
2020-01-15 20:11:04 +01:00
Laurent Destailleur
98eda68afb
Fix linkg to public notes
2020-01-15 19:49:45 +01:00
Laurent Destailleur
28d5901da4
Fix error of mysqldump not thrown in some cases
2020-01-15 16:45:13 +01:00
Laurent Destailleur
ed0e4b53d4
Fix error in mysqldump
2020-01-15 16:11:31 +01:00
Laurent Destailleur
3bd95c205d
Tooltip to understand the new dictionary of holidays
2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269
Trans
2020-01-15 14:44:53 +01:00
John Botella
10c973f38f
Fix complex export model loading
2020-01-15 14:36:44 +01:00
Laurent Destailleur
18324962c5
Better help
2020-01-15 13:41:07 +01:00
Laurent Destailleur
6196f5412b
Fix date format
2020-01-15 13:37:04 +01:00
Laurent Destailleur
be9decf06d
Fix date format
2020-01-15 13:36:22 +01:00
Laurent Destailleur
0d413c47b1
Fix duplicate info
2020-01-15 13:33:11 +01:00
Laurent Destailleur
8e269c5e64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/modules/modSociete.class.php
htdocs/filefunc.inc.php
2020-01-15 13:19:37 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields
...
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-15 13:12:56 +01:00
Laurent Destailleur
db17a08144
Fix distrib in ping
2020-01-15 12:52:04 +01:00
Laurent Destailleur
2f36e0cb1c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-15 12:26:22 +01:00
Laurent Destailleur
1d3d26e185
Fix phpcs
2020-01-15 12:26:11 +01:00
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10
...
Addition of delivery times substitution
2020-01-15 12:08:07 +01:00
Laurent Destailleur
4066de94b6
Merge pull request #12848 from atm-ph/fix_11.0_colum_type
...
Fix column type to be as llx_facture
2020-01-15 12:05:54 +01:00
Laurent Destailleur
b4a309a251
Prepare 10.0.7
2020-01-15 12:00:25 +01:00
Laurent Destailleur
610655333d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-15 11:56:58 +01:00
Laurent Destailleur
c8ff847480
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4
Fix Generation of zip of module
2020-01-15 11:55:27 +01:00
Laurent Destailleur
54fa476d1a
Merge pull request #12842 from aspangaro/11.0_p3
...
FIX : Loan Look & feel v11
2020-01-15 11:45:06 +01:00
Laurent Destailleur
14d59f43af
Trans
2020-01-15 11:33:02 +01:00
atm-ph
a088c78279
Fix column type to be as llx_facture
2020-01-15 09:52:12 +01:00
Alexandre SPANGARO
96674b2a7e
FIX : Look & feel v11
2020-01-13 21:19:32 +01:00
Anthony Berton
1eff733e1c
Update functions.lib.php
2020-01-13 18:23:50 +01:00
gauthier
5455130a03
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-13 16:15:22 +01:00
Laurent Destailleur
e2e06b47ff
FIX #12617
2020-01-13 15:58:03 +01:00
Laurent Destailleur
56fb6dce61
FIX #12756
2020-01-13 15:38:46 +01:00
Laurent Destailleur
9d4e1a3941
FIX #12797
2020-01-13 14:25:48 +01:00
Laurent Destailleur
b6ed6df75d
Remove property tha has no sense in output #12803
2020-01-13 14:14:51 +01:00
Laurent Destailleur
9ceec670b9
Fix date format in FEC export
2020-01-13 13:52:48 +01:00
Laurent Destailleur
61d60ce38e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-13 13:35:41 +01:00
Laurent Destailleur
ccdee44ed1
Look and feel v11
2020-01-13 13:35:29 +01:00
Laurent Destailleur
f94b3e55b9
Merge pull request #12768 from atm-maxime/fix_loan_currency2
...
Remove € + unsed code and file
2020-01-13 13:19:14 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
...
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1
Fix translation of \n and \\s into language files.
2020-01-13 13:11:25 +01:00
Laurent Destailleur
adeed186bb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-13 12:34:28 +01:00
Laurent Destailleur
bfa13e16ed
Debug MO module
2020-01-13 12:30:48 +01:00
Laurent Destailleur
5740d17450
Better help
2020-01-13 12:10:20 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0
...
Fix Warning
2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc
2020-01-13 10:43:39 +01:00
Laurent De Coninck
67d73c5488
Fix the select of the provider for one product
2020-01-12 21:56:35 +01:00
Laurent Destailleur
a6bae97826
Sync from transifex
2020-01-12 21:28:09 +01:00
Laurent Destailleur
4716b82249
Fix clone of page
2020-01-11 14:44:12 +01:00
Laurent Destailleur
58e5eeabdd
Fix to be able to use zip signature
2020-01-11 11:15:50 +01:00
Laurent Destailleur
89ab80e598
Fix typo
2020-01-10 14:41:58 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
efb506ba7f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f
Fix sql error on update of subledger account on a various payment
...
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
Laurent Destailleur
dd930fe791
Can disable a not expected behaviour on price propagation
2020-01-10 01:07:58 +01:00
Frédéric FRANCE
7bea60af84
can replace formconfirm in order supplier
2020-01-10 00:27:40 +01:00
Frédéric FRANCE
47ee03acdc
Update odf.php
2020-01-10 00:26:46 +01:00
Frédéric FRANCE
188024339d
Update choix_date.php
2020-01-10 00:25:46 +01:00
Frédéric FRANCE
f8f45be225
Update choix_autre.php
2020-01-10 00:25:42 +01:00
Frédéric FRANCE
095336f333
Update create_survey.php
2020-01-10 00:25:37 +01:00
Frédéric FRANCE
90b4a4d314
Update index.php
2020-01-10 00:25:31 +01:00
Laurent Destailleur
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft
...
FIX drafts are now implemented for stats
2020-01-10 00:15:13 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior
...
Fix folder rename behavior
2020-01-10 00:11:47 +01:00
Laurent Destailleur
91078d6d0f
Merge pull request #12822 from laudeco/hotfix/barcode-initiator
...
fix the init of the barcode
2020-01-10 00:07:38 +01:00
Laurent Destailleur
3916c53337
Update codeinit.php
2020-01-10 00:07:26 +01:00
Laurent Destailleur
78dcf91f02
Fix bad link
2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
f9262b0dcf
Transifex sync
2020-01-09 22:30:00 +01:00
Laurent Destailleur
c6c321b004
Fix website when ckeditor is off
2020-01-09 17:28:08 +01:00
Laurent Destailleur
cef38016bb
Trans
2020-01-09 17:16:30 +01:00
florian HENRY
e0dfe894f5
fix warning
2020-01-09 16:45:17 +01:00
florian HENRY
2847131be0
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-01-09 16:31:11 +01:00
florian HENRY
83ada939d5
fix warning
2020-01-09 16:26:30 +01:00