Commit Graph

81776 Commits

Author SHA1 Message Date
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Laurent Destailleur
edaff84f41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-14 13:41:44 +01:00
Laurent Destailleur
26f0a30cfa Fix syntax error 2019-12-14 13:41:33 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Laurent Destailleur
06ff74af80
Merge pull request #12683 from frederic34/patch-6
do not trim int
2019-12-14 13:22:30 +01:00
Laurent Destailleur
7ad6520b45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-13 17:16:34 +01:00
Laurent Destailleur
7d39554797 FIX Bad type of sql fields 2019-12-13 17:16:21 +01:00
Laurent Destailleur
6a03015fa4 Fix warning 2019-12-13 16:29:58 +01:00
Laurent Destailleur
d3c333dacb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-13 15:52:18 +01:00
Laurent Destailleur
d38c73c90a FIX output of emails from and error on emailing pages. 2019-12-13 15:52:08 +01:00
Laurent Destailleur
850b09d295 Add solution to fix css troubles on live. 2019-12-13 14:26:31 +01:00
Rüdiger Hahn
4dd3cb3469
Prevent stock amount from becoming NULL
Set stock to 0 if NULL
2019-12-13 07:58:36 +01:00
Laurent Destailleur
95141550fa NEW Support of deployement of metapackages 2019-12-12 15:40:06 +01:00
Laurent Destailleur
0d56cd00ce Fix property not defined 2019-12-12 11:42:10 +01:00
Laurent Destailleur
bf1533e7c1 Fix HTML5 2019-12-12 11:33:07 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
5454380834 CSS 2019-12-11 19:14:41 +01:00
Laurent Destailleur
6f4e2e7e61 Fix rounding with multicurrency 2019-12-11 17:58:14 +01:00
Laurent Destailleur
0b73cdb7cc Fix use of currency accuracy 2019-12-11 17:14:32 +01:00
Laurent Destailleur
63b9656468 Fix use of currency accuracy 2019-12-11 17:05:42 +01:00
Rüdiger Hahn
cc96ad03c1
Update replenish.php 2019-12-11 14:00:27 +01:00
Frédéric FRANCE
2b86955890
Update contrat.class.php 2019-12-10 19:44:20 +01:00
Laurent Destailleur
82a92b3c08
Merge pull request #12681 from dvasseur/rest-update-propal
FIX: propal update
2019-12-10 19:21:28 +01:00
Laurent Destailleur
f98713efdd
Update propal.class.php 2019-12-10 19:20:23 +01:00
Laurent Destailleur
452976850f
Update propal.class.php 2019-12-10 19:18:45 +01:00
Frédéric FRANCE
b5c5b4e765
Update contrat.class.php 2019-12-10 18:55:22 +01:00
Frédéric FRANCE
3762bbd643
do not trim int 2019-12-10 18:46:07 +01:00
David
4c463cdbb5
FIX: propal update
Update fields 'date' and 'fin_validite'
2019-12-10 16:16:33 +01:00
Laurent Destailleur
738526e77e Fix br 2019-12-10 14:04:50 +01:00
Laurent Destailleur
57c77f700c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-10 14:02:14 +01:00
Laurent Destailleur
fe44d3a4fa FIX #12674 2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79 Try better fix for #12674 2019-12-10 13:55:45 +01:00
Laurent Destailleur
b551ebab0f
Merge pull request #12673 from arunasr/fix_docker_build
Docker corrections
2019-12-10 11:41:38 +01:00
Laurent Destailleur
6e007b2ee3
Merge pull request #12676 from frederic34/patch-7
doxygen
2019-12-10 11:36:03 +01:00
Frédéric FRANCE
e078bc6f83
doxygen 2019-12-10 08:08:56 +01:00
Laurent Destailleur
968c9ae874
Merge pull request #12671 from frederic34/patch-8
Update server_order.php
2019-12-10 05:54:34 +01:00
Arunas Ruksnaitis
5572102ae5 Docker corrections 2019-12-10 00:30:47 +00:00
Frédéric FRANCE
39da0bef9e
Update server_order.php 2019-12-09 23:56:46 +01:00
Laurent Destailleur
67401d717a
Merge pull request #12634 from frederic34/patch-7
The variable $out does not seem to be defined for all execution paths
2019-12-09 17:44:06 +01:00
Laurent Destailleur
dfeca5fae8 Fix phpcs 2019-12-09 17:42:38 +01:00
Laurent Destailleur
8190a68bba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-09 16:18:41 +01:00
Laurent Destailleur
89c5407e46 Fix phpcs 2019-12-09 16:18:29 +01:00
Laurent Destailleur
ee5cac39c4
Merge pull request #12663 from Dolibarr/scrutinizer-patch-19
Scrutinizer Auto-Fixes
2019-12-09 16:06:38 +01:00
Laurent Destailleur
f8b1d2825a
Merge pull request #12637 from atm-florianm/NEW_10.0_card_of_bill_created_from_template__add_link_to_template
NEW Link to template of origin in bill cards for bills created from template
2019-12-09 16:05:47 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
78998921b6
Merge pull request #12625 from frederic34/patch-6
Update cronjob.class.php
2019-12-09 15:58:36 +01:00
Laurent Destailleur
c8f457f303
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
Fix warning introduce by my #12605 PR #12622
2019-12-09 15:57:24 +01:00
Laurent Destailleur
04a7de14c6
Merge pull request #12660 from Ahuahuachi/develop
Bugfix: Module builder missing table prefix
2019-12-09 15:56:01 +01:00
Laurent Destailleur
8c50097012
Update modulebuilder.lib.php 2019-12-09 15:55:25 +01:00