Commit Graph

90545 Commits

Author SHA1 Message Date
Laurent Destailleur
cd9acd02a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom
fix table creation for intracom and change reserved name column name
2020-10-15 20:19:05 +02:00
Laurent Destailleur
86887fc650
Update intracommreport.php 2020-10-15 20:18:00 +02:00
Laurent Destailleur
4c684536d1
Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab
NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
2020-10-15 20:16:45 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev
Fix : correction de commentaires
2020-10-15 20:15:12 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type
FIX : Use table_element instead of element
2020-10-15 20:14:39 +02:00
Laurent Destailleur
5044d7a808
Merge pull request #15032 from gnovaro/patch-1
Improve README.md adding 2 more shields
2020-10-15 20:14:10 +02:00
Laurent Destailleur
4662402a40
Merge pull request #15033 from jasson99/resizeBrowserSizeForTests
Specify window size for tests run
2020-10-15 20:12:20 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
tests.
2020-10-15 19:36:08 +02:00
jasson99
741700db7a admin login stepdefinition moved from addUsersContext file to loginContext file 2020-10-15 19:41:49 +05:45
jasson99
15dfcdb8e3 window-size is kept fixed for acceptance tests run 2020-10-15 19:26:10 +05:45
Gustavo Novaro
4727aee211
Improve README.md adding 2 more shields
- Add minimum php version
- Latest release
2020-10-15 13:44:54 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
stickler-ci
cd5201e40a Fixing style errors. 2020-10-15 10:24:00 +00:00
Florian HENRY
0cb04d14d7 NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late 2020-10-15 12:20:37 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
Laurent Destailleur
c271761212 Update doc 2020-10-15 11:36:19 +02:00
ATM-Nicolas
20aee01fd8 FIX : Use table_element instead of element 2020-10-15 11:14:20 +02:00
Laurent Destailleur
f33688bd0c Update doc 2020-10-15 11:01:37 +02:00
Laurent Destailleur
d21578d759 Update doc 2020-10-15 10:47:44 +02:00
Laurent Destailleur
5b091c01db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 10:42:08 +02:00
Laurent Destailleur
6ad069a883 Enhance doc 2020-10-15 10:41:57 +02:00
Laurent Destailleur
7ba513f569
Merge pull request #15024 from amunaadh/develop
ReadMe file inside Acceptance test edited
2020-10-15 10:30:17 +02:00
Laurent Destailleur
520645a02c Renamed all methods valide() into validate() 2020-10-15 10:15:37 +02:00
Yamuna Adhikari
6779b85094
Merge pull request #7 from amunaadh/EditAcceptance-ReadMe
ReadMe file inside Acceptance test edited
2020-10-15 10:34:00 +05:45
amunaadh
baddd7741e ReadMe file edited
Co-authored-by: Swikriti Tripathi <swikriti808@gmail.com>
2020-10-15 10:20:13 +05:45
Laurent Destailleur
9cc8e6ac99 Fix intracommreport 2020-10-14 20:25:02 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
d283e8f649 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
20d5098ce2 Fix regression in dol_getdate() 2020-10-14 19:42:17 +02:00
Laurent Destailleur
bc1ad96ad1 FIX #14993 2020-10-14 19:28:59 +02:00
Laurent Destailleur
a8eeb7099a Fix style of online help when page available. 2020-10-14 19:01:37 +02:00
Laurent Destailleur
9162e1fe96
Merge pull request #15020 from defrance/patch-159
NEW If specific help page is available, we change color of icon
2020-10-14 18:53:44 +02:00
Laurent Destailleur
f4ef8a3285
Use class instead of hard coded style 2020-10-14 18:52:41 +02:00
Givriz
c50e288a07 Correction de commentaires
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
2020-10-14 18:26:05 +02:00
BENKE Charlene
1af3881796
If specific help present we change color of icon 2020-10-14 18:08:31 +02:00
Laurent Destailleur
1e2fd359ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 18:03:19 +02:00
Laurent Destailleur
fc69b88923 Update doc 2020-10-14 18:03:02 +02:00
Laurent Destailleur
034d3d7072
Merge pull request #15014 from amunaadh/develop
[Tests-only] Added API tests for add users feature
2020-10-14 17:54:51 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147
fix:allow const files loading from modules inside custom folders
2020-10-14 17:39:08 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList
NEW Selectable columns on sales tax list
2020-10-14 17:37:23 +02:00
Laurent Destailleur
afc0460a7f
Merge pull request #15006 from davidNDU/clone/develop
Model Builder template/class/myobject.class.php faulty SQL statement
2020-10-14 17:36:13 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php 2020-10-14 17:35:14 +02:00
Laurent Destailleur
820bf5b393
Merge pull request #15011 from bafbes/abb120348
fix:boolean values in showinputfield function are 1 and 0 not 'on' and 'off'
2020-10-14 17:18:02 +02:00
Laurent Destailleur
ee19f3fc94
Update actions_addupdatedelete.inc.php 2020-10-14 17:16:35 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349
fix:two fields with same ids
2020-10-14 17:15:24 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM
NEW display stat for BOM on "object referent"/linked Object product tab
2020-10-14 17:14:47 +02:00