Commit Graph

85897 Commits

Author SHA1 Message Date
Laurent Destailleur
708f89c9dc
Merge pull request #13732 from pstructures/new-devlelop
Fixed Translation Issue Default Contact Address For Field
2020-04-24 19:00:04 +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
d2e17c5427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 16:27:56 +02:00
Laurent Destailleur
b77892451f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552 FIX Situation invoice take into account the credit notes. 2020-04-24 15:57:08 +02:00
Laurent Destailleur
b2b580f6fb Report error 2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad Report error 2020-04-24 15:21:02 +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
Laurent Destailleur
eda3643639
Merge pull request #13730 from simicar29/11.0-expedition
Clean line extrafields when deleting expedition
2020-04-24 15:16:41 +02:00
Laurent Destailleur
c96937d101
Merge pull request #13729 from simicar29/11.0-contrat
Clean line extrafields when deleting contrat
2020-04-24 15:16:29 +02:00
Laurent Destailleur
4f04128514
Merge pull request #13734 from TobiasSekan/FixMissingVcardValuesOfContact
FIX missing vCard values of contacts
2020-04-24 15:16:16 +02:00
stickler-ci
6d4d638ec1 Fixing style errors. 2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f
fix wrong set e-mail for vCard + docu update 2020-04-24 14:12:43 +02:00
Tobias Sekan
5d9432e4d0
fix style 2020-04-24 14:02:54 +02:00
Tobias Sekan
cab4f35438
fix missing vcard values 2020-04-24 14:01:08 +02:00
Tobias Sekan
e315435d20
Merge pull request #20 from Dolibarr/develop
pull from develop
2020-04-24 13:58:37 +02:00
Matt Sidnell
dd070cc680 Update commonobject.class.php 2020-04-23 20:37:15 +01:00
Laurent Destailleur
5756e3be09 Look and feel v12 2020-04-23 20:45:51 +02:00
Laurent Destailleur
997c2344cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-23 20:03:52 +02:00
Laurent Destailleur
2ba6e65feb Fix label 2020-04-23 20:03:41 +02:00
stickler-ci
ababad540a Fixing style errors. 2020-04-23 17:29:52 +00:00
Laurent Destailleur
a90398af06
Merge pull request #13726 from simicar29/11.0-supplierproposal
Clean line extrafields when deleting supplier proposal
2020-04-23 19:27:39 +02:00
Laurent Destailleur
2fcb2ff19f
Merge pull request #13727 from simicar29/11.0-fichinter
Clean line extrafields when deleting fichinter
2020-04-23 19:27:22 +02:00
Marc Guenneugues
b4fbb86548 Clean line extrafields when deleting reception 2020-04-23 19:22:25 +02:00
Marc Guenneugues
3ea8d1895b Clean line extrafields when deleting expedition 2020-04-23 19:09:05 +02:00
stickler-ci
b8a4c0d83b Fixing style errors. 2020-04-23 17:02:57 +00:00
Marc Guenneugues
a70be95760 Clean line extrafields when deleting contrat 2020-04-23 19:00:47 +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
Laurent Destailleur
2befc9b978
Merge pull request #13728 from Dolibarr/scrutinizer-patch-7
Scrutinizer Auto-Fixes
2020-04-23 18:55:45 +02:00
stickler-ci
93735bf9cd Fixing style errors. 2020-04-23 16:55:36 +00:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note
actioncomm note deprecated
2020-04-23 18:52:56 +02:00
Marc Guenneugues
285f215acf Clean line extrafields when deleting fichinter 2020-04-23 18:52:45 +02:00
Laurent Destailleur
4e6017e5bf Look and feel v12 2020-04-23 18:50:20 +02:00
Laurent Destailleur
0aa0d62f43 Fix constant 2020-04-23 18:42:59 +02:00
Laurent Destailleur
c054b45ac6
Merge pull request #13501 from ptibogxiv/patch-324
FIX better url for get conf with REST API
2020-04-23 18:40:10 +02:00
Laurent Destailleur
201a2349f6
Merge branch 'develop' into patch-324 2020-04-23 18:39:30 +02:00
Laurent Destailleur
388e98fdf0
Merge pull request #13724 from simicar29/11.0-supplierinvoice
Clean line extrafields when deleting supplier invoice
2020-04-23 18:35:34 +02:00
Marc Guenneugues
ab5c2b1fd5 Clean line extrafields when deleting supplier proposal 2020-04-23 18:33:58 +02:00
Laurent Destailleur
fdf8ce1965 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-23 18:33:36 +02:00
Laurent Destailleur
73ddfb1c81 Use label instead of libelle 2020-04-23 18:33:25 +02:00
Laurent Destailleur
922efaf49b
Merge pull request #13714 from simnandez/11.0
FIX: Error update SQL into stock reception
2020-04-23 18:31:11 +02:00
Laurent Destailleur
02c5530e1f
Update mouvementstock.class.php 2020-04-23 18:31:01 +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
Laurent Destailleur
bcad90ccf2
Merge pull request #13715 from ndrosis/patch-25
Fix check VAT ID HTTP to HTTPS
2020-04-23 18:22:39 +02:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php 2020-04-23 18:21:17 +02:00