Commit Graph

656 Commits

Author SHA1 Message Date
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/list.php
2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
745e2be678 FIX encoding status in graph of vendor proposals 2021-01-28 16:00:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
3a2230e41d Fix rounding 2021-01-11 13:43:33 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters
Conflicts:
	htdocs/bom/bom_card.php
2021-01-11 13:11:40 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
5fe8c599d2 Fix warning 2020-12-16 00:28:57 +01:00
Laurent Destailleur
32741dd6f6 Fix warning 2020-12-15 10:51:35 +01:00
Laurent Destailleur
de37c0bff0 Fix Warning 2020-12-15 01:59:18 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Frédéric FRANCE
4e18f46f28 doxygen 2020-12-05 23:53:55 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
stickler-ci
ddf82f3e7a Fixing style errors. 2020-12-04 14:45:26 +00:00
atm-benoit
b9461322d9 FIX SUPPLIER PROPOSAL v12 bug add 2020-12-04 15:37:00 +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
59b445a103 Clean dead code 2020-11-28 14:47:39 +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
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00: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
Frédéric FRANCE
d122238439 Update supplier_proposal.class.php 2020-10-31 13:29:08 +01:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Francis Appels
93ab281d81 Fix tab indent 2020-10-26 18:21:47 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
Francis Appels
fa8e4a9bb0 No trigger for supplier proposal 2020-10-26 17:02:33 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function.
Use correct naming convention for new method naming.
2020-10-26 16:50:52 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +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
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
AurelienBinard
39d538befc Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Laurent Destailleur
e3542c6d4f Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Aurélien
5571a166c6 change variable #14697 2020-10-06 11:37:55 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00