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

2298 Commits

Author SHA1 Message Date
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Regis Houssin
45ba23da3e FIX #13028 2020-02-07 08:53:05 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
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
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
Laurent Destailleur
37617bbce8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 03:48:27 +01:00
Laurent Destailleur
b3a50bd4b0 FIX #12874 2020-02-03 03:47:45 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00: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
be2d6494a7 FIX #12908 2020-01-28 21:23:05 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
0c666ee73b Fix reponsive 2020-01-22 12:46:01 +01:00
Laurent Destailleur
7a0bff06b9 Fix reponsive 2020-01-22 12:44:10 +01:00
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
9e6fb7b2f1 Look and feel v11 2020-01-07 14:55:31 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
e8db3a2aa0 Fix look and feel v11 2019-12-19 10:17:20 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
8b57e9fcf0 Merge pull request #12697 from bb2a/patch-7 
Full name in uppercase on creation and modification
 2019-12-14 14:00:09 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
stickler-ci
31b09f433f Fixing style errors. 2019-12-12 16:29:11 +00:00
Anthony Berton
68a1b12fba Update user.class.php 2019-12-12 17:27:24 +01:00
Frédéric FRANCE
12f84d8254 doxygen 2019-12-11 23:04:27 +01:00
Frédéric FRANCE
66805a502a doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
2fd6c690c0 Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card 
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
 2019-12-09 15:59:55 +01:00
Frédéric FRANCE
6366a2a606 doxygen 2019-12-06 18:05:16 +01:00
Laurent Destailleur
22f575dad0 Merge pull request #12633 from atm-lena/FIX_getrights_request 
FIX getrights() request
 2019-12-06 16:22:47 +01:00
Frédéric FRANCE
d9bfa62367 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
atm-lena
486f598067 FIX getrights() request 2019-12-05 16:11:12 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Laurent Destailleur
06de7f968f Fix class not found 2019-12-05 14:06:03 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +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
John Botella
4a33ee60f8 Fix user card : use comma in amounts inputs 2019-12-02 10:34:14 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
d58bb5f66b Fix link to user 2019-11-28 16:16:55 +01:00
ptibogxiv
825349e07e Update api_users.class.php 2019-11-27 16:04:52 +01:00
stickler-ci
bba4ed02d2 Fixing style errors. 2019-11-26 20:36:30 +00:00