Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,408 Commits 36 Branches 189 Tags
9c4ba1c5d2b51b2d25868f45c4ccfd7296b1722c
Commit Graph

600 Commits

Author SHA1 Message Date
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
63ba601906 Update box_project.php 2020-02-05 12:39:00 +01:00
Pierre Ardoin
81ed70ffc7 Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3 Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700 Update box_project.php 2020-02-05 08:50:51 +01:00
Pierre Ardoin
d93a597a1e Fix Compatbility with Multicompany 
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
 2020-02-04 09:17:02 +01:00
Laurent Destailleur
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
fa305a1471 Update box_factures_imp.php 2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741 Fix: strict mode mysql compatibility 2020-01-23 10:47:52 +01:00
Frédéric FRANCE
9fdd1357d0 The variable $num does not seem to be defined for all execution paths 2019-12-16 20:21:06 +01:00
Frédéric FRANCE
9357bfd98e doxygen 2019-12-12 08:17:14 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
3a687b1dae Fix box of task hidden if tasks are not used 2019-11-26 17:44:21 +01:00
Alexandre SPANGARO
f4e1361d06 NEW small fix 2019-11-22 06:53:05 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
562e219cc5 Merge pull request #12314 from frederic34/patch-7 
add thirdparty email in box_propales
 2019-11-04 20:51:57 +01:00
Laurent Destailleur
d934f5e920 Fix wrap 2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae Fix css 2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103 css 2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843 css 2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6 Responsive 2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc Update box_propales.php 2019-11-03 23:55:04 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
18b662e430 Update box_graph_orders_permonth.php 2019-11-01 16:01:08 +01:00
Frédéric FRANCE
d14015e3df Update box_graph_invoices_permonth.php 2019-11-01 15:59:17 +01:00
Frédéric FRANCE
dab8aabb16 Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:58:30 +01:00
Frédéric FRANCE
93b00038f8 Update box_graph_orders_supplier_permonth.php 2019-11-01 15:57:40 +01:00
Frédéric FRANCE
5bdb9da5c5 Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:56:15 +01:00
Frédéric FRANCE
931f2b809d Update box_graph_orders_permonth.php 2019-11-01 15:52:13 +01:00
Frédéric FRANCE
44c8cd9d23 give a value by default 
The variable $fileurlnb does not seem to be defined for all execution paths
 2019-11-01 15:48:55 +01:00
Laurent Destailleur
aa306bf5d4 Debug widgets 2019-10-31 23:50:36 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
248016cd5d Merge pull request #12241 from frederic34/contactphone 
Contactphone
 2019-10-30 02:52:11 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Frédéric FRANCE
043a71442f contact phone 2019-10-27 20:06:16 +01:00
Frédéric FRANCE
486047c357 Update box_produits.php 2019-10-18 23:14:43 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
7a927a22e3 Merge pull request #12137 from frederic34/patch-15 
Update box_task.php
 2019-10-16 14:31:01 +02:00
Laurent Destailleur
1d7efbdc64 Merge pull request #12138 from frederic34/patch-16 
FIX datec in box ticket
 2019-10-16 13:02:59 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00