Florian HENRY
|
cf1c4ce11f
|
add missing hook
|
2021-04-13 09:51:08 +02: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 |
|
Nicolas
|
cdd2c165ef
|
add missing hook addMoreActionsButtons in viewcat.php
|
2021-02-05 11:36:12 +01:00 |
|
Laurent Destailleur
|
af41c06822
|
Fix warnings
|
2020-12-29 04:27:16 +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 |
|
Stephane Lesage
|
7853e77d3f
|
Export/Import categories missing fields and clean
|
2020-12-15 19:53:47 +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 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Tobias Sekan
|
b2a953ed5b
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-18 12:21:41 +02:00 |
|
Sekan, Tobias
|
eac9e54e0b
|
fix more different button visibility
|
2020-09-18 11:48:53 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|