lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

19454 Commits

Author SHA1 Message Date
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +01:00
Scrutinizer Auto-Fixer
59c0631172 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-06 09:49:12 +00:00
ptibogxiv
2ca6b8f633
Update pdf_espadon.modules.php 2020-02-06 10:49:05 +01:00
ptibogxiv
f1cce26ef0
FIX need weight short label in shipping doc 
need short label because value + term is too long
 2020-02-06 10:47:56 +01:00
Laurent Destailleur
48e6db17bd Fix doc 2020-02-06 10:28:49 +01:00
Laurent Destailleur
2966b2303b Fix phpcs 2020-02-06 10:23:04 +01:00
Laurent Destailleur
48cd8e1314 Fix doc 2020-02-06 10:17:06 +01:00
Laurent Destailleur
857c22cb29 Fix doc 2020-02-06 10:13:10 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder 
NEW Hidden option MAIN_TEMP_DIR
 2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php 2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php 2020-02-05 20:42:03 +01:00
stickler-ci
1ecef695f8 Fixing style errors. 2020-02-05 19:40:22 +00:00
Laurent Destailleur
3e73e97f24
Update conf.class.php 2020-02-05 20:39:38 +01:00
Laurent Destailleur
98ac0428a5
Update conf.class.php 2020-02-05 20:37:49 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
80f4e625be Fix phpcs 2020-02-05 17:07:42 +01:00
Laurent Destailleur
fdfc45bbe9 Fix wrapping 2020-02-05 15:04:11 +01:00
Florian Mortgat
eb17a52027 FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap 2020-02-05 14:57:40 +01:00
Laurent Destailleur
a2bb64354b Fix bad merge 2020-02-05 14:56:01 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
9515467300
Merge pull request #13005 from RubenRuCh/11.0 
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
 2020-02-05 14:30:40 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
andreubisquerra
220f02805d Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)

Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2020-02-05 14:12:29 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop 
Update image path after move image directory
 2020-02-05 14:10:12 +01:00
Laurent Destailleur
ddd1ca26b9 CSS 2020-02-05 14:04:19 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php 2020-02-05 12:49:56 +01:00
Laurent Destailleur
8051e916c0
Merge pull request #13017 from andreubisquerra/develop 
Add bold tags to Receipt Printers module
 2020-02-05 12:40:07 +01:00
Laurent Destailleur
63ba601906
Update box_project.php 2020-02-05 12:39:00 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account 
fix error message for if no stripe enabled 0b891d5e0c
 2020-02-05 12:04:27 +01:00
Pierre Ardoin
81ed70ffc7
Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3
Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700
Update box_project.php 2020-02-05 08:50:51 +01:00
Laurent Destailleur
0b891d5e0c FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:47 +01:00
Laurent Destailleur
bc19f72306 FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:20 +01:00
Laurent Destailleur
bb1c9a66dd Fix code alignement on modulebuilder 2020-02-04 16:37:30 +01:00
Laurent Destailleur
976ce0a954 Fix scrutinizer 2020-02-04 14:33:25 +01:00
Laurent Destailleur
157745a1bb Fix phpcs 2020-02-04 14:18:37 +01:00
AdrianDominik
4695172028 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-02-04 11:40:37 +01:00
Pierre Ardoin
d93a597a1e
Fix Compatbility with Multicompany 
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
 2020-02-04 09:17:02 +01:00
Laurent Destailleur
bf4fca0c7e Fix warning 2020-02-03 22:09:21 +01:00
Laurent Destailleur
c367c6f34e Avoid warning 2020-02-03 21:17:45 +01:00
andreubisquerra
e6dc384ee9
Add bold tags 2020-02-03 19:33:23 +01:00
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
Laurent Destailleur
97d726733c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 2020-02-03 06:36:43 +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
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +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
240727c3e1 FIX #12975 2020-02-03 03:08:54 +01:00
Laurent Destailleur
3f73339818 Fix trans 2020-02-03 03:01:23 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
andreubisquerra
a4c1c00728
Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
 2020-02-02 21:02:43 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view 
NEW monthly view to enter time
 2020-02-02 20:05:18 +01:00
Laurent Destailleur
86c1777702
Merge pull request #12976 from mapiolca/patch-28 
Add support of Number2Words module (v2)
 2020-02-02 19:54:49 +01:00
Laurent Destailleur
7cb2c21dc2 FIX #12974 2020-02-02 19:50:53 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +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
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +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
2dd1e34c2d Fix phpcs 2020-01-31 19:01:31 +01:00
Laurent Destailleur
ad6758c4da Fix bad var 2020-01-31 18:03:45 +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
0cd8337b7e NEW Can manage situation invoices 2020-01-31 14:54:42 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
atm-quentin
78baae1480 Fix stickler v2 2020-01-31 11:51:40 +01:00
atm-quentin
398e83d1cc FIX for stickler 2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5 Fixing style errors. 2020-01-31 10:26:33 +00:00
atm-quentin
a001913751 Debut modification saisie par mois 
NEW hook and data id

NEW visu FROM day TO day in permonth view

FIX
 2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10 NEW visu FROM day TO day in permonth view 2020-01-31 11:10:40 +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
51c6540a56 WIP Advanced search 2020-01-30 23:28:50 +01:00
Laurent Destailleur
c0bf89929f Code comment 2020-01-30 19:14:59 +01:00
Laurent Destailleur
b47e1bd8e8 Fix protection when creating extrafield of type separator 2020-01-30 18:47:41 +01:00
Laurent Destailleur
7b92aaa115 Fix templateResult into templateSelection 2020-01-30 18:45:50 +01:00
Laurent Destailleur
c58f76b15c Fix constant name 2020-01-30 17:06:26 +01:00
Pierre Ardoin
05d3c134db
Add support of Number2Words module (v2) 
if the Number2Words Module is detected, this conversion is selected.
 2020-01-30 15:58:21 +01:00
Laurent Destailleur
141664ff10 Fix phpcs 2020-01-30 02:25:26 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
4b0ca24ca3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:51 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +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
Laurent Destailleur
e13f1509b3
Merge pull request #12965 from frederic34/patch-6 
Update extrafields.class.php
 2020-01-29 22:57:01 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +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
Frédéric FRANCE
dcc8b4b65e
Update extrafields.class.php 2020-01-29 15:35:46 +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
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
Tobias Sekan
8b3eb35cd1
[NEW] Hidden option MAIN_TEMP_DIR 2020-01-29 10:55:56 +01:00
Laurent Destailleur
2fe333fe90
Merge pull request #12950 from andreubisquerra/develop 
Default example receipt template
 2020-01-28 20:41:56 +01:00
andreubisquerra
09bcb39cff
Default to Example 2020-01-28 18:59:51 +01:00
Laurent Destailleur
ff3a7a45cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:33 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
andreubisquerra
d0b3614c57
Default receipt template 2020-01-28 15:31:03 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name 2020-01-28 08:55:49 +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
4fe942985f FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:22:59 +01:00
Laurent Destailleur
a230a0aa13 Fix url to pay 2020-01-27 21:37:52 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
50d9ac0b52 Fix else if 2020-01-27 02:13:12 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +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
17ceeb6a6e
Merge pull request #12729 from frederic34/patch-6 
NEW upload odt models for order
 2020-01-26 23:55:04 +01:00
Laurent Destailleur
9cd2a63752
Merge pull request #12739 from frederic34/patch-7 
NEW upload odt models for proposal
 2020-01-26 23:49:31 +01:00
Laurent Destailleur
4a5dca4a3d Fix test 2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1 
New : Add native spellcheck to CKEditor
 2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php 2020-01-26 23:31:19 +01:00
Laurent Destailleur
d13e5bc90b FIX #12875 2020-01-26 23:22:47 +01:00
Laurent Destailleur
3215af9900
Merge pull request #12923 from simicar29/develop 
New: Add Hook doPreMassActions
 2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac
Update massactions_pre.tpl.php 2020-01-26 22:32:37 +01:00
Laurent Destailleur
627fa996a3
Merge pull request #12922 from simicar29/simicar29-patch-2 
Update "submitted only" module options
 2020-01-26 22:27:54 +01:00
Laurent Destailleur
8ff19a2a0f WIP search component 2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f Can choose text to show when there is no data 2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59 Fix phpcs 2020-01-25 14:40:16 +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
09e707b818 trans 2020-01-25 13:05:40 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0 Fix css 2020-01-24 20:11:07 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +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
stickler-ci
cfa67b6a5d Fixing style errors. 2020-01-24 08:47:11 +00:00
simicar29
4761671fc8
Add Hook doPreMassActions 
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
 2020-01-24 09:41:22 +01:00
simicar29
65cc1202ce
Update "submitted only" module options 
Don't update to the null value options absent from the posted parameters.
 2020-01-24 09:23:08 +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
12b4909c45 Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +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
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
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Laurent Destailleur
41577714ce Add link to pay online into sponge template. 2020-01-23 11:25:08 +01:00
Laurent Destailleur
298b273496
Merge branch 'develop' into patch-22 2020-01-23 11:20:24 +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
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +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
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2679f057fb Doc 2020-01-22 14:40:43 +01:00
Laurent Destailleur
d6a31f60cd Clean code 2020-01-22 14:39:00 +01:00
Laurent Destailleur
ee21ea5ef8 Fix phpcs 2020-01-22 14:27:38 +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
57569604b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +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
46df9e59ab
Merge pull request #12888 from andreubisquerra/master 
Fix escpos DummyConnector
 2020-01-22 13:56:43 +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
395b9bf7ac Fix syntax error 2020-01-22 13:41:05 +01:00
Laurent Destailleur
de99426247 Fix MRP 2020-01-22 12:53:51 +01:00
Laurent Destailleur
d94e091951 Can exclude some countries from list 2020-01-21 23:49:04 +01:00
Laurent Destailleur
ff9a2608d8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
 2020-01-21 22:22:16 +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
8bd835d937 NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages 
in same document.
 2020-01-21 16:17:18 +01:00
Laurent Destailleur
4922567a27 Add .noexec extension for old php4, php5... files 2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867 Add .noexec extension for old php4, php5... files 2020-01-21 15:01:22 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
Laurent Destailleur
b813a5a4e0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 13:03:02 +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
a3a3835c76 Fix fatal error 2020-01-21 12:19:39 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
stickler-ci
b864325041 Fixing style errors. 2020-01-21 09:07:14 +00:00
Pierre Ardoin
1d4e36ba3d
Add Link to Pay if Online payment is used 
Before : URL to Online Payment never shown.

Now : URL shown when PayPal, Stripe or PayBox are used.
 2020-01-21 10:04:49 +01:00
Laurent Destailleur
4598538b42 Prepare PDF templates to use 2 languages for titles 2020-01-21 01:55:00 +01:00
Laurent Destailleur
ab5940f28c Fix css lost 2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25 Add country id and country code in substitution vars 2020-01-21 00:28:53 +01:00
Laurent Destailleur
d6e81c5da4 Fix var not defined 2020-01-21 00:20:18 +01:00
Laurent Destailleur
d2cf4c55ee Fix label of status 2020-01-20 23:58:01 +01:00
Laurent Destailleur
5b86851cf3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1 Doc 2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +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
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
b8938b8d19 Fix look and feel v11 2020-01-20 02:18:00 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
andreubisquerra
70362e7609
Fix travis 2020-01-19 16:44:33 +01:00
andreubisquerra
d4d0ef1295 Fix escpos DummyConnector 2020-01-19 16:16:59 +01:00