Commit Graph

81756 Commits

Author SHA1 Message Date
Frédéric FRANCE
b59d93c8d7
doxygen 2019-12-11 20:11:53 +01:00
Frédéric FRANCE
1733aa18df
fix phpcs 2019-12-11 19:57:10 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +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
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
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
Laurent Destailleur
a12b2fea80
Update modulebuilder.lib.php 2019-12-09 15:54:14 +01:00
John Botella
e1cf93d9a9 Fix exif_read_data fatal error 2019-12-09 14:44:37 +01:00
Laurent Destailleur
655574262b Fix google plus 2019-12-09 14:01:55 +01:00
Laurent Destailleur
7697143611
Merge pull request #12621 from frederic34/markdown
clean markdown
2019-12-09 13:59:53 +01:00
Laurent Destailleur
ef20611d00
Merge pull request #12639 from frederic34/patch-8
doxygen
2019-12-09 13:56:18 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
63a26ed436 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2019-12-09 13:24:01 +01:00
Laurent Destailleur
e8366efeec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-09 13:05:16 +01:00
Laurent Destailleur
fba274997a
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
Fix dolGetBadge class
2019-12-09 13:05:07 +01:00
Laurent Destailleur
0bb5df42e1
Merge pull request #12650 from frederic34/patch-15
The property datem does not exist on Societe
2019-12-09 13:04:31 +01:00
Laurent Destailleur
668dc1e7c2
Merge pull request #12646 from frederic34/patch-13
do not trim int
2019-12-09 13:04:01 +01:00
Laurent Destailleur
9e9bc64a3c
Merge pull request #12648 from frederic34/patch-14
Update server_order.php
2019-12-09 13:03:39 +01:00
Laurent Destailleur
816f2075fb
Merge pull request #12651 from frederic34/patch-17
The variable $db seems to be never defined
2019-12-09 13:03:11 +01:00
Laurent Destailleur
df7a86dd42
Merge pull request #12652 from frederic34/doxygen_societe
doxygen societe class
2019-12-09 13:02:49 +01:00
Laurent Destailleur
2ccd83e4bf
Merge pull request #12658 from frederic34/patch-20
Update new.php
2019-12-09 10:52:37 +01:00
Laurent Destailleur
0a3b2987d1
Merge pull request #12657 from frederic34/patch-19
doxygen
2019-12-09 10:47:16 +01:00
Laurent Destailleur
4b8ebe94ad
Merge pull request #12661 from frederic34/patch-21
typo + doxygen
2019-12-09 10:46:32 +01:00