lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

1179 Commits

Author SHA1 Message Date
Laurent Destailleur
f7ed6c8a0b
Merge pull request #18129 from evarisk-theo/add-ticket-categories-views 
NEW: ticket categories views
 2021-07-16 12:46:14 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-13 14:04:14 +02:00
Théo David
d8db447112 fix: rename select_tickets into selectTickets 2021-07-12 14:12:20 +02:00
stickler-ci
ce9bd51cb2 Fixing style errors. 2021-07-12 07:17:08 +00:00
evarisk-theo
3bc2dec696
Merge branch 'Dolibarr:develop' into add-ticket-categories-views 2021-07-12 09:10:25 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-12 09:10:15 +02:00
Laurent Destailleur
f18269bee1 Comment 2021-07-11 01:42:07 +02:00
Laurent Destailleur
bffbf4ae63
Merge pull request #18123 from OPEN-DSI/fix_00011 
FIX get categories linked to another object type
 2021-07-11 01:37:37 +02:00
kamel
073ace3a9e FIX get categories linked to another object type 2021-07-09 16:23:46 +02:00
kamel
ec6fadf196 Fix hook constructCategory when several new categories is added by several modules 2021-07-09 15:29:39 +02:00
Laurent Destailleur
555f1c719b Debug v14 2021-07-06 04:29:25 +02:00
Théo David
079608fe00 NEW #18046 Add ticket ticket categories functions 2021-07-02 10:26:03 +02:00
Théo David
110b0fecf5 NEW #18046 Add ticket categories views 2021-07-02 10:05:45 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
f99b1b261a Fix phpcs 2021-05-18 17:25:31 +02:00
Laurent Destailleur
ba595d8b74 Minor fix 2021-05-18 16:56:57 +02:00
Laurent Destailleur
2974a23332 css 2021-05-18 16:54:31 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php 2021-05-17 09:54:04 +02:00
stickler-ci
79b51baa3d Fixing style errors. 2021-05-12 22:46:09 +00:00
Frédéric Bagnol
8d035f5ec2
Add soc in categories contacts list 2021-05-13 00:40:56 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Florian HENRY
cf1c4ce11f add missing hook 2021-04-13 09:51:08 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
cc54b7fe29 Fix dol_string_onlythesehtmlattributes 2021-03-25 00:03:09 +01:00
Laurent Destailleur
8b4870b8b2 Fix look and feel v14 2021-03-24 23:44:50 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
835f9d4ae8
Merge pull request #16834 from dolibit-ut/patch-126 
Update card.php
 2021-03-20 11:50:06 +01:00
Laurent Destailleur
ee1d7faf96
Merge pull request #16835 from dolibit-ut/patch-127 
Update viewcat.php
 2021-03-20 11:49:50 +01:00
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
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
stickler-ci
b5c2c6b755 Fixing style errors. 2020-10-22 14:15:16 +00:00
Josep Lluís
31ae2f2a21
NEW form to add customer/supplier into categories 
Form to add customers and suppliers into categories, as in products
 2020-10-22 16:12:01 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
00e9a9a509 Sanitize color 2020-10-06 17:10:00 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
53b9866d20
Merge pull request #14845 from TobiasSekan/FixWrongExpectedTypeInViewcat 
FIX wrong expected type for "dol_print_error" in "viewcat.php"
 2020-09-28 17:23:28 +02:00
Laurent Destailleur
c6c2dc53cb
Merge pull request #14844 from TobiasSekan/FixCountErrorOnUserCatgories 
FIX count error on user categories
 2020-09-28 17:17:49 +02:00
Sekan, Tobias
f810f2c8e4 Fix wrong expected type in viewcat.php 2020-09-28 09:13:15 +02:00
Sekan, Tobias
e3591a767e fix count error on user categories 2020-09-28 08:31:39 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Laurent Destailleur
06da242200 css 2020-09-23 16:43:25 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00