Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

1295 Commits

Author SHA1 Message Date
Frédéric FRANCE
bae1770176 uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
UT from dolibit
953b09adf6 Update viewcat.php 
$helpurl  ->  $help_url
 2021-03-19 09:27:29 +01:00
UT from dolibit
31e018636d Update card.php 
$help_url = 'EN:Module_Categories|FR:Module_Catégories|DE:Modul_Kategorien';

llxHeader("", $langs->trans("Categories"), $help_url);
 2021-03-19 09:25:47 +01:00
Laurent Destailleur
efaeeb2d06 Merge pull request #16701 from dolibit-ut/patch-82 
Update card.php
 2021-03-16 10:43:08 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
UT from dolibit
884859d649 Update card.php 
$helpurl = 'EN:Module_Categories|FR:Module_Catégories';

two translations of comments
 2021-03-15 19:08:02 +01:00
Frédéric FRANCE
c5af6d2087 fix php8 warnings 2021-03-15 00:17:43 +01:00
Laurent Destailleur
0bb9834c67 Protect fetch 2021-03-14 19:10:32 +01:00
Laurent Destailleur
72766c830d FIX #Yogosha5631 2021-03-14 15:06:40 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
6fcb7a96a1 code syntax categorie collab directory 2021-02-23 18:04:37 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f Fix autoselect of category with 'auto' 2021-02-05 15:07:07 +01:00
Nicolas
cdd2c165ef add missing hook addMoreActionsButtons in viewcat.php 2021-02-05 11:36:12 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
00c284794c Merge pull request #15478 from StephaneLesage/catlist-icons-edit-delete 
NEW: Add edit/delete action icons on categories list pages
 2020-12-27 15:10:09 +01:00
Laurent Destailleur
7178918cb4 Merge pull request #15476 from StephaneLesage/fix-edit-category 
Fix edition of tag/category which used type parameter instead of object's type
 2020-12-27 15:08:50 +01:00
Laurent Destailleur
93b9061a71 Merge pull request #15698 from StephaneLesage/export-categories 
FIX: missing imports/exports of categories
 2020-12-16 15:30:00 +01:00
Laurent Destailleur
d781d78c4e Fix warning 2020-12-16 12:53:31 +01:00
StephaneLesage
49225f3f57 Fix /categories/info.php navigation 2020-12-15 20:17:37 +01:00
StephaneLesage
7749138a81 Fix /categories/edit.php which used type parameter instead of object's type 
Do not read type parameter
Security check, display error and exit
Get type from category object
 2020-12-15 20:17:13 +01:00
Stephane Lesage
7853e77d3f Export/Import categories missing fields and clean 2020-12-15 19:53:47 +01:00
StephaneLesage
574f1f0336 Add edit/delete action icons on categories list pages 
+ classes for icons
+ format color as in latest commits
 2020-12-15 19:50:27 +01:00
Laurent Destailleur
f56b46bd3e Debug v13 2020-12-09 17:14:35 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
bc1d286673 Merge pull request #15495 from Givriz/dev 
Feature : creation of a "button-cancel" class
 2020-11-23 21:53:45 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
f4829e7a16 Update viewcat.php 2020-11-04 18:38:45 +01:00
Regis Houssin
1653e17181 FIX syntax error, missing token in url 2020-11-04 10:26:45 +01:00
Frédéric FRANCE
e9a9e9bbc2 Update edit.php 2020-10-31 18:55:24 +01:00
Frédéric FRANCE
b7271bd0d9 Update card.php 2020-10-31 18:51:20 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
df7218b6a4 Fix for multicompany 2020-10-31 12:39:14 +01:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Laurent Destailleur
f670f71df9 Fix scrutinizer 2020-10-27 19:14:03 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
b2f08e5762 Update categorie.class.php 2020-10-26 19:23:23 +01:00
Frédéric FRANCE
a031adf99e clean code 2020-10-25 20:07:22 +01:00
Frédéric FRANCE
772661c6ba clean code 2020-10-25 19:44:01 +01:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00