Commit Graph

22973 Commits

Author SHA1 Message Date
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
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Laurent De Coninck
1d62834b2c use the second version for default bank account 2020-10-24 17:15:48 +02:00
dvdwalker
8b91b5527a Update to allow importing extrafileds on Product Supplier Price 2020-10-24 11:13:44 -03: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
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
c3863aeed8 Update commonobject.class.php 2020-10-23 18:18:01 +02:00
Laurent Destailleur
50da1cd95e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required
FIX no empty value in required extrafield
2020-10-23 17:29:12 +02:00
Florian HENRY
53a76dc01f fix mail error message 2020-10-23 16:39:45 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
jpb
47351c3cb3 Fix : stickler-ci 2020-10-23 13:55:55 +02:00
jpb
63c82b47fe Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate 2020-10-23 12:27:14 +02:00
jpb
1ecff0a608 add list and crud 2020-10-23 11:58:25 +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
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +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