Commit Graph

71829 Commits

Author SHA1 Message Date
VESSILLER
4ea042213e NEW show project label in project index 2019-12-11 10:59:19 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +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
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
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
Scrutinizer Auto-Fixer
54ca37dc65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-09 09:35:58 +00:00
Laurent Destailleur
652e99600a Look and feel v11 2019-12-09 09:43:38 +01:00
Laurent Destailleur
7797c5628f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-09 09:17:12 +01:00
Laurent Destailleur
eb0d20b77e Fix label of country
Fix div empty
2019-12-09 09:16:59 +01:00
Frédéric FRANCE
76cf54e6e7
typo + doxygen 2019-12-09 08:07:59 +01:00
Alfredo Altamirano
39afe39016 Bugfix: Module builder missing table prefix
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
2019-12-08 19:29:46 -06:00
Laurent Destailleur
2ca5a4378b Fix empty div when no address
Fix deletion of MO
2019-12-09 00:54:42 +01:00
Laurent Destailleur
d0f90de33c css 2019-12-09 00:27:54 +01:00
Laurent Destailleur
9e479afff1 WIP Complete module MRP 2019-12-09 00:06:51 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Frédéric FRANCE
fbb5fbae13
Update new.php 2019-12-08 23:02:34 +01:00
Frédéric FRANCE
c05ba624ce
Update deplacement.class.php 2019-12-08 22:46:22 +01:00
Frédéric FRANCE
3db84df60e
Update card.php 2019-12-08 22:45:10 +01:00
Frédéric FRANCE
6c5629b5a5
Update deplacement.class.php 2019-12-08 22:39:33 +01:00
Frédéric FRANCE
49f22facef
doxygen 2019-12-08 22:37:19 +01:00
Laurent Destailleur
a6ca56a7e1 Fix navigation backtopage and "save and stay" 2019-12-08 15:57:51 +01:00
Frédéric FRANCE
48564ea760
doxygen societe class 2019-12-08 14:26:59 +01:00
Frédéric FRANCE
f0af450494
The variable $db seems to be never defined
The variable $db seems to be never defined on line 154
2019-12-08 13:40:55 +01:00
Frédéric FRANCE
ab33bb1d3b
The property datem does not exist on Societe 2019-12-08 13:37:50 +01:00
Laurent Destailleur
53149bb7cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2019-12-08 04:22:50 +01:00
Laurent Destailleur
394104291a Fix function not found when creating a payment of an expense report 2019-12-08 04:22:09 +01:00
Frédéric FRANCE
72c30c4101
Update server_order.php 2019-12-07 23:39:09 +01:00