Commit Graph

21748 Commits

Author SHA1 Message Date
Laurent Destailleur
cc17f08409
Merge pull request #15131 from frederic34/patch-13
doxygen
2020-10-25 14:45:24 +01:00
Laurent Destailleur
f31b4ee49d
Merge pull request #15127 from frederic34/task_universal
fix unknown property db
2020-10-25 14:35:03 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11
doxygen
2020-10-25 14:34:15 +01:00
Laurent Destailleur
180d01e76e
Merge pull request #15132 from frederic34/patch-14
doxygen
2020-10-25 14:34:04 +01:00
Laurent Destailleur
bb6a71c534
Merge pull request #15135 from frederic34/loanlib
fix variable
2020-10-25 14:15:18 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
000fa91235
fix variable 2020-10-24 13:39:59 +02:00
Frédéric FRANCE
adf1cd1fb7
doxygen 2020-10-24 09:42:52 +02:00
Frédéric FRANCE
e476678a54
doxygen 2020-10-24 09:32:39 +02:00
Frédéric FRANCE
3d3b530357
doxygen 2020-10-23 22:24:20 +02:00
Frédéric FRANCE
96e80f116a
fix unknown property db 2020-10-23 22:06:23 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
Laurent Destailleur
81543df5e4 Fix warnings 2020-10-23 04:24:54 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4
Update cproductnature.class.php
2020-10-23 04:07:03 +02:00
stickler-ci
5638a49774 Fixing style errors. 2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php 2020-10-23 00:22:34 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated 2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php 2020-10-22 22:20:48 +02:00
Laurent Destailleur
9699bdc0fa Fix phpcs 2020-10-22 21:31:34 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Laurent Destailleur
a6484e933b Css 2020-10-22 18:28:47 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +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
Laurent Destailleur
b88a9fc94d
Update actions_addupdatedelete.inc.php 2020-10-22 16:15:11 +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
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
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
5a52534675
Merge pull request #15072 from FHenry/12.0_fix_14649
FIX #14649
2020-10-22 15:51:31 +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
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
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
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
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