Commit Graph

78207 Commits

Author SHA1 Message Date
Tim Otte
fbafbc3e19 Added myself to the author list 2019-09-04 15:16:29 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
Tim Otte
0f02a621ba Seriously? One newline failed the stickler ci test? 2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf Removed debug output 2019-09-03 10:36:00 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Tim Otte
258ad409c0 Added stickler yml to succeed in pull request 2019-08-27 16:36:06 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Laurent Destailleur
12a09b8b2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/invoice.php
2019-08-27 15:56:56 +02:00
Laurent Destailleur
1ac9affd82 Trans 2019-08-27 15:54:44 +02:00
Laurent Destailleur
d4d3e28437 It is diffcult to understand how stock decrease is done so we show the
ref of stock.
2019-08-27 15:53:03 +02:00
Laurent Destailleur
81beadbed8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 15:43:28 +02:00
Laurent Destailleur
d5328d1cec Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 15:43:19 +02:00
Laurent Destailleur
a2b1d96d42 Fix protection in cleaning invoice with transaction. Delete also
extrafield lines.
2019-08-27 15:42:35 +02:00
Laurent Destailleur
7165389f6c Add log
Add protection to avoid change on a non draft invoice.
2019-08-27 15:39:35 +02:00
Laurent Destailleur
478b1fea25 FIX #11711 2019-08-27 15:06:50 +02:00
Laurent Destailleur
b73a0c4ee7
Merge pull request #11465 from atm-maxime/new_choose_lines_from_origin
NEW : can choose lines while creating order from origin
2019-08-27 15:01:26 +02:00
Laurent Destailleur
f9094cfc44
Update card.php 2019-08-27 15:00:41 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
Laurent Destailleur
9867928fd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 14:10:32 +02:00
Laurent Destailleur
3eb32360ce Fix escape 2019-08-27 14:10:23 +02:00
Laurent Destailleur
8598dae6ea
Merge pull request #11765 from ptibogxiv/patch-248
Fix tab and lang
2019-08-27 13:57:41 +02:00
ptibogxiv
1b64c89c2a
Fix tab and lang 2019-08-27 13:32:55 +02:00
Jean Traullé
b0905c90cb Fix Minimum PHP vers. requirement in Readme 2019-08-27 13:14:01 +02:00
Laurent Destailleur
1dccd27b8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 13:13:14 +02:00
Laurent Destailleur
bcd2158c72
Merge pull request #11762 from jtraulle/patch-1
Fix Minimum PHP vers. requirement in Readme
2019-08-27 13:12:18 +02:00
Jean Traullé
69507118d1
Fix Minimum PHP vers. requirement in Readme 2019-08-27 12:58:28 +02:00
Laurent Destailleur
f41cca15ba
Merge pull request #11761 from ptibogxiv/patch-247
FIX amount or stripe account with currency
2019-08-27 12:49:04 +02:00
ptibogxiv
9ac1add425
FIX amount or stripe account with currency 2019-08-27 12:46:28 +02:00
Laurent Destailleur
442793aa65
Merge pull request #11755 from jtraulle/stickler-ci
Add .stickler.yml config file
2019-08-27 12:39:50 +02:00
Laurent Destailleur
31e99414b5 Prepare for php 8 2019-08-27 12:34:46 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
c2c9e1d042 Fix warning 2019-08-27 12:15:29 +02:00
Laurent Destailleur
20f61fb9be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Jean Traullé
9ca85b8e19
Disabling coding style checks for Pull Requests
Because coding style would have been checked by SticklerCI, we can safely skip this in Travis-CI when in Pull Request context.
It will increase build speed by about 50%.
2019-08-27 09:30:42 +02:00
Jean Traullé
dd1e7bbc3d
Merge branch 'develop' into stickler-ci 2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f
Fix CI (code style) 2019-08-27 08:43:58 +02:00
Laurent Destailleur
48d6583f1d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:42:52 +02:00
Laurent Destailleur
505a06ca3e Fix phpunit 2019-08-27 03:42:34 +02:00
Laurent Destailleur
b1479e5787 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
855ebc298f Removed hound (not used) 2019-08-27 03:39:27 +02:00
Laurent Destailleur
01e2a181b8 Fix user not yet enrolled 2019-08-27 03:36:47 +02:00
Laurent Destailleur
0ae7be8fe6 Test sponsor github 2019-08-27 03:34:43 +02:00
Laurent Destailleur
a77c8023dc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:23:59 +02:00
Laurent Destailleur
784f5ec097 Fix bad name of hidden constant 2019-08-27 03:23:25 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00