Commit Graph

81293 Commits

Author SHA1 Message Date
Laurent Destailleur
034267edbf
Merge pull request #12516 from frederic34/patch-15
doxygen
2019-11-26 09:11:10 +01:00
Laurent Destailleur
b44817f2bf
Merge pull request #12518 from frederic34/patch-17
doxygen
2019-11-26 09:10:47 +01:00
Laurent Destailleur
04573728f9
Merge pull request #12520 from andreubisquerra/master
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
2019-11-26 09:09:51 +01:00
Laurent Destailleur
9d2a5e6c42 Trans 2019-11-26 09:08:32 +01:00
Laurent Destailleur
b440f2b1f4 Fix a ref is not null 2019-11-26 08:53:54 +01:00
Frédéric FRANCE
1ccf0808d0
doxygen 2019-11-26 00:28:26 +01:00
Frédéric FRANCE
77a300c9ae
doxygen 2019-11-26 00:20:40 +01:00
andreubisquerra
6baa1c8d4a
Fix travis 2019-11-25 23:32:40 +01:00
Laurent Destailleur
1f8361ea9e Tooltip 2019-11-25 21:02:26 +01:00
Laurent Destailleur
a8c2aa094d More examples 2019-11-25 20:30:05 +01:00
andreubisquerra
b2e995279e Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php 2019-11-25 19:29:07 +01:00
andreubisquerra
53ec106365
Merge pull request #2 from Dolibarr/develop
Update
2019-11-25 16:08:33 +01:00
Laurent Destailleur
2f3614df8a Fix lang loaded 2019-11-25 12:53:56 +01:00
Laurent Destailleur
cf67f650eb Better decoding of email topics 2019-11-25 10:12:26 +01:00
Laurent Destailleur
d34f487c65 Decode subject by emailcollector 2019-11-24 21:30:00 +01:00
Laurent Destailleur
1bace80a9b Fix the home page is not set on first page created 2019-11-24 20:59:17 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
19fb6bfd17 FIX Use PROV as temporary ID for leaves 2019-11-24 18:25:55 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
andreubisquerra
ddaf830de2
Merge pull request #1 from Dolibarr/develop
Update
2019-11-23 12:33:26 +01:00
Laurent Destailleur
cf0311dd6a FIX Hook getAccessForbiddenMessage was missing parameters 2019-11-22 16:13:22 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Laurent Destailleur
886c763573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-22 15:21:32 +01:00
Laurent Destailleur
14450d8b79 psr 2019-11-22 15:21:21 +01:00
Laurent Destailleur
97c727e21c
Merge pull request #12498 from Dolibarr/scrutinizer-patch-14
Scrutinizer Auto-Fixes
2019-11-22 15:15:48 +01:00
Scrutinizer Auto-Fixer
1eab97080c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 14:13:30 +00:00
Laurent Destailleur
31956d8912 Standard of REST API URL 2019-11-22 15:11:28 +01:00
Laurent Destailleur
e4d9f99484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/remx.php
	htdocs/expedition/card.php
	htdocs/fourn/facture/card.php
2019-11-22 15:04:40 +01:00
Laurent Destailleur
186a13f101 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-22 14:51:13 +01:00
Laurent Destailleur
ece35538f0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-22 14:49:29 +01:00
Laurent Destailleur
1cb1473948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-22 14:48:23 +01:00
Laurent Destailleur
7cf71f7283
Merge pull request #12477 from code-chicken/develop
Use virtual stock when it has been configured
2019-11-22 14:47:32 +01:00
Laurent Destailleur
3242835111
Update replenish.php 2019-11-22 14:47:15 +01:00
Laurent Destailleur
5ef54e3eb8 Doc 2019-11-22 14:45:44 +01:00
Laurent Destailleur
32f590f274
Merge pull request #12485 from aspangaro/12.0_a2
NEW Add shipment widget
2019-11-22 14:39:56 +01:00
Laurent Destailleur
796c13403d
Merge pull request #12486 from TobiasSekan/FixBoardTaskNumberAlwaysZero
Fix open tasks number on dashboard was always zero
2019-11-22 14:37:48 +01:00
Laurent Destailleur
74aa75e879
Merge pull request #12494 from Dolibarr/scrutinizer-patch-13
Scrutinizer Auto-Fixes
2019-11-22 14:36:01 +01:00
Laurent Destailleur
2fc00437d8
Merge pull request #12493 from Dolibarr/scrutinizer-patch-12
Scrutinizer Auto-Fixes
2019-11-22 14:35:49 +01:00
Laurent Destailleur
f0e7eaf0cd
Merge pull request #12453 from c3do/patch-3
API New get / add / remove subproducts, attributes and variants
2019-11-22 14:34:54 +01:00
Laurent Destailleur
9eb98ca94c
Merge pull request #12478 from ptibogxiv/patch-281
FIX display job of contact list
2019-11-22 14:26:12 +01:00
Laurent Destailleur
eeaef48349
Merge pull request #12488 from atm-gauthier/8.0_fix_recalcultva_only_if_not_ventil
FIX : we need to be able to recalculate tva only if invoice not ventil
2019-11-22 14:25:40 +01:00
Laurent Destailleur
4043356f3a
Update card.php 2019-11-22 14:25:32 +01:00
Laurent Destailleur
fcfe579e14
Merge pull request #12472 from atm-john/10.0_fix_extrafields_expedition
Fix dom and showOptionals call
2019-11-22 14:23:24 +01:00
Laurent Destailleur
e2009ceff0 Fix extrafields of line for receptions 2019-11-22 14:22:35 +01:00