Commit Graph

72013 Commits

Author SHA1 Message Date
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
Laurent Destailleur
9d5a91b6e8
Merge pull request #10235 from torvista/sql-install
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
2018-12-17 21:14:48 +01:00
Laurent Destailleur
eed4d9509b
Merge pull request #10243 from AXeL-dev/patch-3
fix executable files security check regex
2018-12-17 21:09:32 +01:00
Laurent Destailleur
14c249ec0b
Merge pull request #10236 from andreubisquerra/master
Fix some TakePOS small bugs from last third-party commits
2018-12-17 21:08:42 +01:00
Laurent Destailleur
db15f85798
Update setup.php 2018-12-17 21:08:24 +01:00
Laurent Destailleur
3a4538f429 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 19:37:56 +01:00
Laurent Destailleur
c444ef3b4d FIX wrapper could not download shared files 2018-12-17 19:37:17 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
1faaed504a Fix param attachment 2018-12-17 18:48:41 +01:00
Laurent Destailleur
ffaff4dc7f Debug website module 2018-12-17 17:29:04 +01:00
Laurent Destailleur
4e940ebaf1 FIX Download of files with hashp when files are into user dir 2018-12-17 15:35:20 +01:00
Laurent Destailleur
17b2fd295f FIX Css of amount on remain to pay on expense report 2018-12-17 13:57:30 +01:00
AXeL-dev
7f014d76cc fix executable files security check regex 2018-12-17 12:31:12 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
6b5c0d1ea1 Save cash fence event into unalterable log 2018-12-17 11:41:59 +01:00
Laurent Destailleur
1979e3238c Fix rounding 2018-12-17 10:42:30 +01:00
Laurent Destailleur
e06b06c788 Work on cash fence 2018-12-17 10:37:56 +01:00
Laurent Destailleur
6ee484e2a2 Fix migration 2018-12-17 09:38:36 +01:00
Laurent Destailleur
cbb5e3bbe9 Better translation 2018-12-17 03:31:20 +01:00
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed Standardize code. 2018-12-17 03:25:45 +01:00
Laurent Destailleur
71890cbb08 Fix phpcs 2018-12-17 03:14:31 +01:00
torvista
54c56ff069 minor error 2018-12-16 22:15:44 +01:00
torvista
6ce76903a5 removed double quotes as per Travis failure 2018-12-16 21:22:31 +01:00
Laurent Destailleur
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
andreubisquerra
a53688151d Fix some TakePOS small bugs from last third-party commits 2018-12-16 19:24:49 +01:00
torvista
f5d1eea4dc added regions and provinces for Andorra, Hungary, Portugal, Slovenia.
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
2018-12-16 18:28:11 +01:00
Laurent Destailleur
72c5943c55 Execute trigger so we can record line into unalterable log table 2018-12-16 17:53:23 +01:00
Laurent Destailleur
c50646be1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 17:48:15 +01:00
Laurent Destailleur
f1451904c0 Fix phpcs 2018-12-16 17:48:02 +01:00
Laurent Destailleur
ce2d67f225 Fix phpcs 2018-12-16 17:45:51 +01:00
Laurent Destailleur
c06e4ecd68
Merge pull request #10192 from AurelGDN/develop
New: TakePOS +add Temporary ticket
2018-12-16 17:44:18 +01:00
Laurent Destailleur
e5e4ef7b8c Work on cash fence 2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
cde9da57f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 13:39:56 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/exports/export.php
2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Laurent Destailleur
4a4bf3273b Experiment disabling of creation of contact+thirdparty with hidden
option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
2018-12-16 13:22:38 +01:00
Laurent Destailleur
8b718d0cb1 Fix phpcs 2018-12-16 13:01:53 +01:00
Laurent Destailleur
699766223f Fix phpcs 2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931 Fix phpcs 2018-12-16 12:59:59 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Laurent Destailleur
8ce6f67773 Fix phpcs 2018-12-15 18:27:38 +01:00