Commit Graph

77277 Commits

Author SHA1 Message Date
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
965bd171eb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:51 +02:00
Laurent Destailleur
513f224349 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:43 +02:00
Laurent Destailleur
c7f06fe50e Fix phpcs 2019-08-26 23:56:17 +02:00
Laurent Destailleur
783c69c618
Merge pull request #11756 from ptibogxiv/patch-245
Fix lang for "nature" in contact
2019-08-26 22:51:23 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
952e395943 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 22:34:51 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
Fix wrong placement to print title and missing hook to print value
2019-08-26 17:14:50 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
9d2942bb88 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-26 16:41:14 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
bdd57ecce7
Merge pull request #11727 from hregis/7.0_price
FIX avoid sql error if fk_project is empty during update
2019-08-26 16:38:57 +02:00
Laurent Destailleur
fc1381c056
Merge pull request #11739 from ptibogxiv/patch-239
Fix display context for takepos in invoice/list.php
2019-08-26 16:38:27 +02:00
Laurent Destailleur
11dbe80a7b
Merge pull request #11740 from ptibogxiv/patch-240
Fix context display with takepos societe/list.php
2019-08-26 16:37:57 +02:00
Laurent Destailleur
11acedbe59
Merge pull request #11735 from ptibogxiv/patch-235
Fix load langs in takepos
2019-08-26 16:35:42 +02:00
Laurent Destailleur
2b8c57b714
Merge pull request #11724 from ptibogxiv/patch-228
Fix stripelive_oauthcallback.php
2019-08-26 16:34:40 +02:00
Laurent Destailleur
039a613ea1
Merge pull request #11728 from ptibogxiv/patch-231
Fix stripetest_oauthcallback.php
2019-08-26 16:29:00 +02:00
Laurent Destailleur
238970c069
Merge pull request #11734 from hregis/8.0_mc2
FIX wrong parameters
2019-08-26 16:28:39 +02:00
Laurent Destailleur
8a6c27379f
Merge pull request #11737 from ptibogxiv/patch-237
Fix lang in takepos
2019-08-26 16:27:50 +02:00
Laurent Destailleur
6771a2e1f9
Update invoice.php 2019-08-26 16:27:00 +02:00
Laurent Destailleur
b21818a510
Merge pull request #11753 from aspangaro/10.0_p7
FIX Missing div for buttons in tax, loan, various payment modules
2019-08-26 16:24:10 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
9e7796d495 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:09:57 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
56ee89c38d
Merge pull request #11742 from ptibogxiv/patch-242
Fix lang in societe/list.php
2019-08-26 16:02:31 +02:00
Laurent Destailleur
7ebd79a45f
Update list.php 2019-08-26 16:02:24 +02:00
Laurent Destailleur
be93cd839f
Merge pull request #11748 from aspangaro/10.0_p6
FIX #11746 Unable to modify amount of insurance of a loan
2019-08-26 15:59:50 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
Alexandre SPANGARO
b00020c4ea FIX #11746 Unable to modify amount of insurance of a loan 2019-08-26 12:10:19 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
ptibogxiv
dbcead47e1
Update list.php 2019-08-24 16:05:21 +02:00
ptibogxiv
7b5c9818f7
Fix context display with takepos societe/list.php 2019-08-24 15:58:33 +02:00
ptibogxiv
7112fcee9a
Update list.php 2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647
Fix display context for takepos in invoice list
fix for thirdparty name and create button
2019-08-24 15:47:17 +02:00
ptibogxiv
c4b18890d9
Update invoice.php 2019-08-24 15:12:56 +02:00
ptibogxiv
bb763ecb59
Fix lang in takepos 2019-08-24 14:02:25 +02:00
ptibogxiv
73a6b45e23
Fix load langs in takepos 2019-08-24 13:26:01 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
b7e7ca46b5 Fix responsive 2019-08-23 14:01:13 +02:00
atm-ph
f14f1c9190 Fix wrong placement to print title and missing hook to print value 2019-08-23 09:15:15 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Laurent Destailleur
2080f92ec2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-22 12:39:13 +02:00