lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

4701 Commits

Author SHA1 Message Date
Regis Houssin
997cb214f1 FIX avoid error "Call to undefined function measuringUnitString()" 2020-06-11 16:52:24 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard 
Cleanup user rights forun commande card
 2020-05-28 21:12:23 +02:00
Laurent Destailleur
c7eb71e19e
Merge pull request #13676 from TobiasSekan/CleanupUserRightsForunFactureCard 
Cleanup user rights on forun facture card
 2020-05-28 21:11:58 +02:00
Laurent Destailleur
a92e952960 Merge branch 'NewVendorInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:32:52 +02:00
Laurent Destailleur
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard 2020-05-26 00:25:38 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Laurent Destailleur
40777cbcd9 Fix phpcs 2020-05-23 20:11:10 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
7d8323b0a7
Merge pull request #13920 from altatof/dispatch 
NEW : edit or delete dispatched lines
 2020-05-23 14:56:04 +02:00
Tobias Sekan
babcdfc99a Fix not working default value (re...) 2020-05-23 14:22:40 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice 
FIX not working default date values for new invoices
 2020-05-23 14:21:50 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices 
FIX not working default values for payment on new invoices
 2020-05-23 13:33:01 +02:00
stickler-ci
2873f4dacf Fixing style errors. 2020-05-22 06:08:12 +00:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment 2020-05-22 08:00:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...) 2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
altairis
80c56b3017 manage stock on edit and delete dispatched lines 2020-05-19 15:59:03 +02:00
altairis
b79a30c0f9 edit and delete dispatched lines 2020-05-19 14:18:06 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Tobias Sekan
3f5f6b3243
Fix lint errors 2020-05-06 12:09:39 +02:00
Tobias Sekan
468829aa70
Add new vendor invoice area page 2020-05-06 11:48:01 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name 
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
 2020-05-05 08:40:30 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject 
FIX not shown error on clone vendor invoice with ExtraFields
 2020-04-24 19:01:42 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception 
Clean line extrafields when deleting reception
 2020-04-24 15:16:51 +02:00
stickler-ci
ababad540a Fixing style errors. 2020-04-23 17:29:52 +00:00
Marc Guenneugues
b4fbb86548 Clean line extrafields when deleting reception 2020-04-23 19:22:25 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder 
Clean line extrafields when deleting supplier order
 2020-04-23 18:56:09 +02:00
stickler-ci
4b58213e5b Fixing style errors. 2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b Clean line extrafields when deleting supplier order 2020-04-23 18:27:06 +02:00
stickler-ci
b5f48fb815 Fixing style errors. 2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209 Clean line extrafields when deleting supplier invoice 2020-04-23 18:14:56 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-23 17:17:42 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
4475df14b4 Finish removal of duplicate hook/trigger 2020-04-23 12:54:28 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Sekan, Tobias
f793844862 Fix missing errror on facture clone 2020-04-23 11:04:14 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace 2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3 
Add API endpoints for supplier invoice lines
 2020-04-22 01:06:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php 2020-04-22 00:59:22 +02:00
stickler-ci
9f4d2ee881 Fixing style errors. 2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines 2020-04-21 16:07:49 +02:00
Sekan, Tobias
06556fe14c indent + comments 2020-04-21 12:25:44 +02:00
Sekan, Tobias
7de4f4d0bb Cleanup user rights on forun commande card 2020-04-21 12:13:15 +02:00
Sekan, Tobias
104e786a79 cleanup user rights on forun facture card 2020-04-21 10:02:18 +02:00
stickler-ci
d4a8718e6c Fixing style errors. 2020-04-21 08:00:14 +00:00
Adrien Jacob
5353082154
FIX Delete extra fields for supplier invoice line 2020-04-21 09:57:45 +02:00
Laurent Destailleur
67a7d6b77d Look and feel v12 2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
stickler-ci
27aeaaecb5 Fixing style errors. 2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594 [BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:42:08 +02:00
stickler-ci
36385e3b88 Fixing style errors. 2020-04-20 12:16:34 +00:00
Adrien Jacob
68702f8053
[BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:12:08 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
atm-quentin
83f3c9ab6e use only 1 if 2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d FIX missing selectedlines on supplier order but checkbox are displayed 2020-04-10 11:55:00 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
f3d35b5a19 Fix phpcs 2020-04-02 17:06:57 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
 2020-04-02 16:49:37 +02:00
Laurent Destailleur
e8fa0ec50c
Merge pull request #13467 from Je2fb/develop 
Update card.php
 2020-04-02 13:30:40 +02:00
Florian Mortgat
f52af23396 NEW: "author" column in the client/supplier invoice lists 2020-04-01 17:09:01 +02:00
Je2fb
fa32618fe9
Update card.php 
If rate change is modify, the currency price is taken in place of the price from the main currency
 2020-03-31 18:58:59 +02:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
Laurent Destailleur
0b7b97ec34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
0ec35793ee
Merge pull request #13433 from ptibogxiv/patch-315 
NEW filter by product on supplier order API
 2020-03-30 19:12:29 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order 
let's get the next replenishment date and order's informations on front-end for selected products
 2020-03-27 15:30:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
 2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
 2020-03-25 19:01:56 +01:00
Alexandre SPANGARO
5528e9ef38 Work on split module fournisseur 2020-03-24 22:02:58 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38 
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
 2020-03-22 20:32:15 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
stickler-ci
0babab2824 Fixing style errors. 2020-03-12 11:48:08 +00:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
simicar29
325d635c48
Load line extrafields when fetching supplier invoice 
PR to load extrafield values of lines when fetchinf supplier invoice.
 2020-03-12 12:43:06 +01:00
Laurent Destailleur
fc05e8d768 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/other.lang
 2020-03-11 18:03:15 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-03-11 17:04:28 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-03-11 16:44:03 +01:00
Laurent Destailleur
c8bbaa07fd FIX Look and feel v11 2020-03-11 15:53:08 +01:00
atm-lena
20aa51f26b FIX - Clone Fourn Command, add line's extrafields Part 2 2020-03-11 15:26:49 +01:00
atm-lena
35f32391a0 FIX - Clone Fourn Command, add line's extrafields 2020-03-10 14:46:15 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2020-03-04 19:28:15 +01:00
Laurent Destailleur
ddc0547eda Fix position of button 2020-03-04 13:31:19 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Marc de Lima Lucio
b58608dab0 NEW: supplier order list: enable multicurrency columns 2020-03-03 09:56:25 +01:00
Marc de Lima Lucio
1c912659eb NEW: supplier invoice list: enable multicurrency columns 2020-03-03 09:38:05 +01:00
Pierre Ardoin
74ac69fc5a
Add Entity in list_product_fournisseur_price() 
Select too the entity value to add const NOTMODIFYOTHERENTITYFOURNPRICE
 2020-02-27 09:16:15 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
ec108162e3 Fix GETPOST 2020-02-25 15:14:37 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00