lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,904 Commits 43 Branches 150 Tags 886 MiB
f4e63bb046
Commit Graph

80033 Commits

Author SHA1 Message Date
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Philippe GRAND
fae572d43a fix : deprecated 2020-10-22 16:29:17 +02:00
Laurent Destailleur
ec2a91471e
Merge pull request #15096 from dvasseur/patch-1 
NEW Allow to edit "demand reason" field though API
 2020-10-22 16:19:11 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00
Laurent Destailleur
0f435f9901
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services 
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
 2020-10-22 16:18:11 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Laurent Destailleur
fec8e5a0b8
Merge pull request #15022 from bafbes/abb120350 
new:handle new type reference in add and update actions
 2020-10-22 16:16:52 +02:00
Laurent Destailleur
81bfbbac26
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:37 +02:00
Laurent Destailleur
0c3f8d2daa
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:14 +02:00
stickler-ci
b5c2c6b755 Fixing style errors. 2020-10-22 14:15:16 +00:00
Laurent Destailleur
b88a9fc94d
Update actions_addupdatedelete.inc.php 2020-10-22 16:15:11 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6 
Add ref instead id in bank check remittance
 2020-10-22 16:12:31 +02:00
Josep Lluís
31ae2f2a21
NEW form to add customer/supplier into categories 
Form to add customers and suppliers into categories, as in products
 2020-10-22 16:12:01 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020 
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
 2020-10-22 16:11:47 +02:00
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master 
TakePOS connector compatibility with templates
 2020-10-22 16:11:16 +02:00
Marc de Lima Lucio
1795ec6a9d FIX: supplier invoice: autoatically calculate payment term when modifying payment condition 2020-10-22 16:11:12 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Laurent Destailleur
db06dc54a5
Merge pull request #15061 from hregis/develop_bug2 
FIX wrong object name
 2020-10-22 16:10:15 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0 
FIX: Payment by BankTransfer
 2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php 2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php 2020-10-22 15:58:24 +02:00
Laurent Destailleur
10a8ce82a9
Update bonprelevement.class.php 2020-10-22 15:57:25 +02:00
Laurent Destailleur
315f125f28
Merge pull request #15068 from OPEN-DSI/calculate_virtual_stock_transverse_mode 
NEW : Calculate the virtual stock in transverse mode
 2020-10-22 15:56:03 +02:00
David
12a599d1c7
Allow "demand reason" field update though API 2020-10-22 15:53:55 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop 
CLOSE #15065 Put the product label in bold in the PDF templates if co…
 2020-10-22 15:53:43 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8 
Add customer country information in popup
 2020-10-22 15:53:12 +02:00
Laurent Destailleur
5a52534675
Merge pull request #15072 from FHenry/12.0_fix_14649 
FIX #14649
 2020-10-22 15:51:31 +02:00
Laurent Destailleur
37749e8e9c
Merge pull request #15075 from FHenry/12.0_fix_status_receipt_tot 
fix set status on order Receipt when no dispatch
 2020-10-22 15:50:30 +02:00
Laurent Destailleur
88df2ef36d
Merge pull request #15076 from FHenry/12.0_fix_margin_token 
fix form token missing
 2020-10-22 15:49:56 +02:00
Laurent Destailleur
a83131276d
Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation 
new: add PDFInvoiceSituation translation key for PDF title
 2020-10-22 15:49:25 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights 
Add rights on margin info on invoice list
 2020-10-22 15:49:05 +02:00
Laurent Destailleur
bf6ec35478
Merge pull request #15095 from joseplluis/patch-9 
FIX input name in MRP mask const
 2020-10-22 15:45:36 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop 
NEW Retrieve discount from invoice from API
 2020-10-22 15:45:09 +02:00
Laurent Destailleur
d7b7e1e386
Merge pull request #15083 from frederic34/printing_module 
can add a driver for printing in module
 2020-10-22 15:43:55 +02:00
Laurent Destailleur
9775728b7d
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order 
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
 2020-10-22 15:43:31 +02:00
Josep Lluís
1221cc854d
FIX input name in MRP mask const 
input name in MRP mask const was wrong
 2020-10-22 15:23:45 +02:00
Marc de Lima Lucio
a232a19e7d FIX: virtual products: supplier discount was not applied in component list 2020-10-22 15:16:33 +02:00
Laurent Destailleur
d521ad6db4
Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d
Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +02:00
Laurent Destailleur
a5d52baa05
Merge pull request #15089 from frederic34/patch-7 
fill incoterms with company parameters
 2020-10-22 15:09:47 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
lvessiller
b13ef34804 NEW add rights on margin info on invoice list 2020-10-22 14:56:53 +02:00
Frédéric FRANCE
7d8df07253
Update card.php 2020-10-22 11:46:12 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php 2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API 
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
 2020-10-22 09:26:46 +02:00
Florian Mortgat
509819c119 FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order) 2020-10-21 23:19:29 +02:00
Frédéric FRANCE
f54164bd10
modify action 2020-10-21 21:33:23 +02:00
Frédéric FRANCE
f500076247
remove warning 2020-10-21 21:21:30 +02:00
Frédéric FRANCE
4873794dc0
doxygen 2020-10-21 21:08:33 +02:00
Frédéric FRANCE
06325f9422
doxygen 2020-10-21 21:00:50 +02:00
Florian HENRY
93a97492ae review 2020-10-21 20:41:50 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +02:00
Frédéric FRANCE
81f6a7abb6
can add a driver for printing in module 2020-10-21 20:18:06 +02:00
Laurent Destailleur
351c8a5a2d Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-10-21 20:10:43 +02:00
Laurent Destailleur
a96c193ab0
Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created 
FIX if no PDF default model in admin for expense report, do not create a PDF
 2020-10-21 19:55:43 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php 2020-10-21 19:54:28 +02:00
Laurent Destailleur
30f8dbad59
Merge pull request #15081 from OPEN-DSI/new-invoice-list-margin-info 
NEW add margin info in invoice list
 2020-10-21 19:53:07 +02:00
Laurent Destailleur
409f8f9866 Update doc 2020-10-21 19:50:40 +02:00
Frédéric FRANCE
672797aa65
add missing parameter 2020-10-21 17:09:40 +02:00
lvessiller
9b423106dc NEW add margin info in invoice list 2020-10-21 16:10:48 +02:00
John Botella
70790009a9 Fix display warranty fields on page load 2020-10-21 14:49:51 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Florian HENRY
c9e62845e8 fix is no PDF default model for expense report, no PDF created 2020-10-21 13:41:17 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Florian HENRY
e23a289553 fix form token missing 2020-10-21 13:26:28 +02:00
Florian HENRY
b0641e6d69 better rix 2020-10-21 13:22:32 +02:00
Florian HENRY
a5e195d1c7 better rix 2020-10-21 13:20:17 +02:00
Florian HENRY
13dfa56c2f fix recipt when no dispatch 2020-10-21 13:18:11 +02:00
Laurent Destailleur
a729bff062 Fix trans 2020-10-21 11:54:18 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Laurent Destailleur
2a31d43938 FIX Show errors in session on login page 2020-10-20 18:41:26 +02:00
stickler-ci
ff02bba5bf Fixing style errors. 2020-10-20 15:18:29 +00:00
Josep Lluís
e51dd2919e
Add customer country information in popup 
Add customer country information in popup of draft invoices.
In other boxes it's ok.
 2020-10-20 17:15:03 +02:00
Florian Mortgat
529dfb8dfb FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched 2020-10-20 16:37:15 +02:00
Laurent Destailleur
4ec4801c77 FIX Only template of enabled modules visible 2020-10-20 15:54:08 +02:00
kamel
134994882c NEW : Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') ) 2020-10-20 15:52:29 +02:00
Louis Carrese
693e345cab CLOSE #15065 Fix formatting 
Had spaces instead of tabs...
 2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132 CLOSE #15065 Put the product label in bold in the PDF templates if configured 
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.

The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
 2020-10-20 14:19:37 +02:00
jcp
b09a618f38 Fix Bank Transfer 2020-10-20 13:19:47 +02:00
jcp
a2d242356a Fix BankTransfer (V12.0.2) 2020-10-20 13:17:14 +02:00
Philippe Grand
85513318d0
Update functions.lib.php 2020-10-20 09:30:41 +02:00
Regis Houssin
c0981128ff FIX wrong object name 2020-10-19 17:10:38 +02:00
Philippe GRAND
5233c6064f fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379 2020-10-19 16:30:12 +02:00
lmarcouiller
1ee8c34bf5 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:20:49 +02:00
lmarcouiller
90b2d41b02 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:19:34 +02:00
lmarcouiller
64d8d5334c FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:12:32 +02:00
Frédéric FRANCE
78bc3ecbfd
Add ref instead id in bank check remittance 2020-10-19 14:10:48 +02:00
lmarcouiller
edd391da3a FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:09:55 +02:00
lmarcouiller
511943c052 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 14:05:32 +02:00
lmarcouiller
71db2603e1 FIX pb of duplicate event on command when refreshing the page after command classification as billed or closed 2020-10-19 13:52:12 +02:00
stickler-ci
18b71e2fa6 Fixing style errors. 2020-10-18 13:38:00 +00:00
ptibogxiv
e1a7de32e1
NEW add alert before change thirdparty in takepos 
With some prices rules, change thirdparty should only done before add products to draft invoice.
We can't block it but display an alert can be done for users
 2020-10-18 15:36:04 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
ptibogxiv
7e8891bef9
NEW display date range if exist in takepos 
usefull for membership via POS (ie use in adherentsplus before pushing in core)
 2020-10-18 12:40:10 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required 2020-10-17 21:15:52 +02:00
Laurent Destailleur
547b3602cc FIX refresh of tasks combo must use an ajax page not a full html page 2020-10-17 21:14:19 +02:00
Laurent De Coninck
cea7fd6894
select the only bank account 
When there is only one bank account in the dropdown of the bank account,
select it by default.

[see: #11878]
 2020-10-17 20:45:37 +02:00
Frédéric FRANCE
8fd4101876
Fix upload photo 2020-10-17 20:43:34 +02:00
Laurent Destailleur
53eef48596 Doc 2020-10-17 20:06:30 +02:00
Laurent Destailleur
a9521b13f9 FIX Assignement of event to create when created from view per user. 2020-10-17 19:52:23 +02:00
Laurent Destailleur
8432a2a0dd Fix phpcs 2020-10-17 19:05:08 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962
Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Laurent Destailleur
4fe857f5d2 Change picto to close a widget 2020-10-17 17:54:09 +02:00
Laurent Destailleur
05535556c7 css 2020-10-17 16:39:47 +02:00
Laurent Destailleur
1a1e23bf5d Clean code 2020-10-17 16:01:43 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
27698ab5c7 Protect page for module management with token even for GET action 2020-10-17 14:01:09 +02:00
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
dfb5c78a68 FIX bad concat when generating desription of event on email sent 2020-10-17 11:51:17 +02:00
Laurent Destailleur
3d215048d0 Update Stripe API use to 2020-08-27 2020-10-17 11:16:30 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
f737e01a31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-16 17:40:35 +02:00
Laurent Destailleur
4a3dc6ecb3 Fix syntax error 2020-10-16 17:40:19 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master 
Change the tag char for security reasons in 'Receipt Printer' module
 2020-10-16 17:20:04 +02:00
Laurent Destailleur
b69d178436
Merge pull request #15038 from aspangaro/13a25 
FIX Binding on expense report (Double rowid)
 2020-10-16 17:15:17 +02:00
Laurent Destailleur
52a5ac965b
Merge pull request #15042 from ndrosis/patch-27 
Add & Update tva for Greece
 2020-10-16 17:13:46 +02:00
Laurent Destailleur
27282d7e3d FIX Include the ticket and mo table in merge process of thirdparty 2020-10-16 17:08:23 +02:00
Laurent Destailleur
885e6caaa1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935 FIX pdf_getlinetotalwithtax must show total incl tax 2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f Look and feel v13 2020-10-16 15:40:52 +02:00
Laurent Destailleur
3e75cbbeb5 Fix for smartphone 2020-10-16 14:50:36 +02:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Laurent Destailleur
4dea8c4bb7 Fix missing token 2020-10-16 13:36:05 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Alexandre SPANGARO
67cf917f7b FIX Binding on expense report (Double rowid) 2020-10-16 11:57:36 +02:00
Laurent Destailleur
7a7e1ad7cf CSS 2020-10-16 00:29:35 +02:00
Laurent Destailleur
5905d3be64 Fix phpcs 2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
cd9acd02a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
 2020-10-15 20:51:30 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
a9a519e890
Merge pull request #15025 from fmarcet/10.0 
FIX: Unable to edit extrafields in expense report
 2020-10-15 20:30:14 +02:00
Laurent Destailleur
4eddcb7503
Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
75290d1bd4
Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391
Update contrat.class.php 2020-10-15 20:24:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom 
fix table creation for intracom and change reserved name column name
 2020-10-15 20:19:05 +02:00
Laurent Destailleur
86887fc650
Update intracommreport.php 2020-10-15 20:18:00 +02:00
Laurent Destailleur
4c684536d1
Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab 
NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
 2020-10-15 20:16:45 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev 
Fix : correction de commentaires
 2020-10-15 20:15:12 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type 
FIX : Use table_element instead of element
 2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
stickler-ci
cd5201e40a Fixing style errors. 2020-10-15 10:24:00 +00:00
Florian HENRY
0cb04d14d7 NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late 2020-10-15 12:20:37 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8 FIX : Use table_element instead of element 2020-10-15 11:14:20 +02:00
Laurent Destailleur
520645a02c Renamed all methods valide() into validate() 2020-10-15 10:15:37 +02:00
Ferran Marcet
32d823c739 FIX: Unable to edit extrafields in expense report 2020-10-15 09:40:50 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Florian HENRY
6a4e01de1d fix review 2020-10-15 08:36:04 +02:00
Florian HENRY
0597768ea8 fix review 2020-10-15 08:28:38 +02:00
Florian HENRY
109d1ab801 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-15 08:25:46 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
bahfir abbes
db5292e647 new:handle new type reference in add and update actions 2020-10-15 01:19:05 +01:00
Laurent Destailleur
9cc8e6ac99 Fix intracommreport 2020-10-14 20:25:02 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
d283e8f649 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
20d5098ce2 Fix regression in dol_getdate() 2020-10-14 19:42:17 +02:00
Laurent Destailleur
bc1ad96ad1 FIX #14993 2020-10-14 19:28:59 +02:00
Laurent Destailleur
a8eeb7099a Fix style of online help when page available. 2020-10-14 19:01:37 +02:00
Laurent Destailleur
f4ef8a3285
Use class instead of hard coded style 2020-10-14 18:52:41 +02:00
Givriz
c50e288a07 Correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
 2020-10-14 18:26:05 +02:00
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
174bc67744 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:23:11 +02:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
stickler-ci
ee631e629f Fixing style errors. 2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c add show empty 2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Florian HENRY
dfa2625de7 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:19 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
BENKE Charlene
1af3881796
If specific help present we change color of icon 2020-10-14 18:08:31 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147 
fix:allow const files loading from modules inside custom folders
 2020-10-14 17:39:08 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList 
NEW Selectable columns on sales tax list
 2020-10-14 17:37:23 +02:00
Laurent Destailleur
afc0460a7f
Merge pull request #15006 from davidNDU/clone/develop 
Model Builder template/class/myobject.class.php faulty SQL statement
 2020-10-14 17:36:13 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields 
NEW : Fill ECM src object fields in dol_add_file_process
 2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php 2020-10-14 17:35:14 +02:00
Laurent Destailleur
820bf5b393
Merge pull request #15011 from bafbes/abb120348 
fix:boolean values in showinputfield function are 1 and 0 not 'on' and 'off'
 2020-10-14 17:18:02 +02:00
Laurent Destailleur
ee19f3fc94
Update actions_addupdatedelete.inc.php 2020-10-14 17:16:35 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349 
fix:two fields with same ids
 2020-10-14 17:15:24 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM 
NEW display stat for BOM on "object referent"/linked Object product tab
 2020-10-14 17:14:47 +02:00
Laurent Destailleur
e423bbf823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 17:11:58 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62 NEW : Fill ECM src object fields in dol_add_file_process 2020-10-14 16:59:05 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00