Commit Graph

70430 Commits

Author SHA1 Message Date
Laurent Destailleur
8ceee52d97
Merge pull request #9507 from frederic34/stripetransac
clean code indentation completely broken
2018-09-15 17:27:20 +02:00
Laurent Destailleur
c587de4a3d
Merge branch 'develop' into stripetransac 2018-09-15 17:27:04 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15
reduce complexity of libstatut propal.class.php
2018-09-15 17:24:59 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate
FIX #9497
2018-09-15 17:14:05 +02:00
Laurent Destailleur
1749c07ffe
Merge pull request #9496 from ptibogxiv/patch-61
Fix currency display in transaction.php
2018-09-15 17:07:27 +02:00
Laurent Destailleur
69a577f58d
Update transaction.php 2018-09-15 17:07:18 +02:00
Laurent Destailleur
ef2970a331
Merge pull request #9495 from ptibogxiv/patch-60
Fix currency display charge.php
2018-09-15 17:05:44 +02:00
Laurent Destailleur
2d0b4e5b5f
Merge pull request #9505 from frederic34/patch-14
Reduce complexity of libstatut asset.class.php
2018-09-15 17:02:16 +02:00
Laurent Destailleur
73f5e183d6
Merge pull request #9386 from frederic34/testsqlAndScript
deprecated test_sql_and_script_inject
2018-09-15 17:01:40 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript 2018-09-15 17:01:23 +02:00
Laurent Destailleur
aacf5a0c86
Merge pull request #9490 from frederic34/patch-10
reduce complexity of libstatut loan.class.php
2018-09-15 17:00:04 +02:00
Laurent Destailleur
5eff159e27
Merge pull request #9489 from frederic34/patch-9
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
5224f9ce56
Merge pull request #9488 from frederic34/patch-6
reduce complexity of libstatut don.class.php
2018-09-15 16:58:28 +02:00
Laurent Destailleur
f88dba91ab Trans 2018-09-15 14:15:21 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Philippe GRAND
5c3a24a00c Standardize and update code 2018-09-15 11:51:21 +02:00
Philippe GRAND
5910e1ddf8 Standardize and update code 2018-09-15 11:15:59 +02:00
Philippe GRAND
7deccb3215 Standardize and update code 2018-09-15 11:06:35 +02:00
Philippe GRAND
0654b7b0ef Standardize and update code 2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04 Standardize and update code 2018-09-15 10:47:50 +02:00
ptibogxiv
e0eb43909d
fix var 2018-09-14 17:57:47 +02:00
ptibogxiv
e9fb2387b0
link to stripe customer 2018-09-14 17:46:02 +02:00
Inovea Conseil
11b561270e Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-09-14 16:40:35 +02:00
ptibogxiv
362c9fd0b1
FIX link in connect mode 2018-09-14 15:38:38 +02:00
ptibogxiv
bf38f1a80f
fix url in connect mode 2018-09-14 15:27:43 +02:00
Philippe GRAND
31274434d9 Standardize and update code 2018-09-14 15:25:17 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe Grand
3d068a431e
Update doc_generic_stock_odt.modules.php 2018-09-14 15:04:27 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Philippe GRAND
6ec65ea580 Merge remote-tracking branch 'upstream/develop' into new_branch_14_09_2018 2018-09-14 13:54:46 +02:00
Laurent Destailleur
56b0a5f1ed FIX Mixing tickets of different thirdparties 2018-09-14 13:07:27 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
ptibogxiv
5dcbfe0e56
fix $servicestatus 2018-09-14 11:18:37 +02:00
Philippe GRAND
18f4755a90 Standardize and update code 2018-09-14 10:20:21 +02:00
Philippe Grand
51ba970eaf
Update html.formsms.class.php 2018-09-14 09:33:16 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Laurent Destailleur
961505d510 NEW Add filter on staff range in list of thirdparties 2018-09-14 01:29:03 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php 2018-09-13 21:45:46 +02:00
Frédéric FRANCE
effde65e4e
Update asset.class.php 2018-09-13 20:42:06 +02:00
Laurent Destailleur
5655856ca5
Merge pull request #9504 from atm-gauthier/6.0_fix_refsupplier
FIX : wrong var name
2018-09-13 17:55:04 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +02:00
Philippe GRAND
3da762a59d Standardize and update code 2018-09-13 15:06:06 +02:00
gauthier
b68523b9c1 FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product 2018-09-13 14:37:12 +02:00
Frédéric FRANCE
6744733730
add hook formconfirm to contractcard 2018-09-13 14:22:45 +02:00
Frédéric FRANCE
79cb1f5699
clean code 2018-09-13 13:57:01 +02:00
tarrsalah
08453a5337 FIX #9497
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
2018-09-13 11:04:11 +01:00
ptibogxiv
c36ee72de0
Update transaction.php 2018-09-13 11:32:52 +02:00
ptibogxiv
fad2502525
Update transaction.php 2018-09-13 11:31:39 +02:00