Commit Graph

6081 Commits

Author SHA1 Message Date
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Laurent Destailleur
33bb1919f0 Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a Merge pull request #15737 from frederic34/pdfBuildThirdpartyName
thirdparty need to be object
2020-12-12 12:16:31 +01:00
Frédéric FRANCE
479d709a96 fix warning 2020-12-12 09:39:54 +01:00
stickler-ci
87038f953a Fixing style errors. 2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906 thirdparty need to be object 2020-12-11 20:57:02 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Hystepik
3d674abfae Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Stephane Lesage
08ccc11f9e Export warehouses 2020-12-08 00:50:27 +01:00
Laurent Destailleur
86e1082138 Merge pull request #15644 from Hystepik/develop#1
New #8172 : PHPExcel replaced by PHPSpreadSheet
2020-12-07 23:06:21 +01:00
Laurent Destailleur
f21a4e8aed Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
4f826fae26 Fix warnings 2020-12-07 12:18:53 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
Hystepik
2ac98d06f5 Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557 Add missing tag order_ref and order_ref_customer on shipments for ODT
generation.
2020-12-06 19:01:09 +01:00
Laurent Destailleur
c31cf08431 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modCategorie.class.php
2020-12-04 21:55:57 +01:00
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
stickler-ci
6a2d842d3e Fixing style errors. 2020-12-04 13:47:55 +00:00
lmarcouiller
9c191cda43 New #8172 : PHPExcel replace by PHPSpreadSheet 2020-12-04 14:28:09 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Hystepik
4830f4a3b4 Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
Hystepik
ecb5a3b028 Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
lmarcouiller
c7a31b2458 new widget funnel of prospection 2020-12-02 14:42:56 +01:00
Laurent Destailleur
c8274f13eb Merge pull request #15582 from Hystepik/develop
Close #15307 New Widget : Encours dépassé
2020-12-02 14:01:50 +01:00
lmarcouiller
6b5125fed0 dev widget state_board, add in user class and clean index 2020-12-01 14:50:12 +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
fc91e70e47 Update modFacture.class.php 2020-11-30 18:37:07 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
lmarcouiller
00dca7ff9b NEW : Encours dépassé #15307 2020-11-30 13:01:45 +01:00
Laurent Destailleur
8eacbaaf5f Merge pull request #15570 from frederic34/strike
simplify function
2020-11-29 19:10:06 +01:00
Laurent Destailleur
5ad1bb5b20 Merge pull request #15571 from frederic34/patch-14
Update mod_codecompta_aquarium.php
2020-11-29 19:08:29 +01:00
Laurent Destailleur
beafcc7853 Fix warning 2020-11-29 16:06:03 +01:00
Frédéric FRANCE
83c60d725a Update mod_codecompta_aquarium.php 2020-11-28 23:45:32 +01:00
Frédéric FRANCE
3a041eed44 simplify function 2020-11-28 23:42:48 +01:00
Frédéric FRANCE
11a978ca08 simplify function 2020-11-28 23:41:44 +01:00
Frédéric FRANCE
eea9382b57 Update mod_codecompta_aquarium.php 2020-11-28 23:35:27 +01:00
Frédéric FRANCE
f9ef0f4d69 Update mod_codecompta_digitaria.php 2020-11-28 23:33:58 +01:00
Frédéric FRANCE
2f701f4889 Update mod_codecompta_aquarium.php 2020-11-28 23:24:13 +01:00
Frédéric FRANCE
fb871daf14 simplify function 2020-11-28 23:04:05 +01:00
Laurent Destailleur
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +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
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +01:00
Laurent Destailleur
9aa657bc35 Debug v13 2020-11-26 18:48:51 +01:00