Commit Graph

85328 Commits

Author SHA1 Message Date
Laurent Destailleur
1ed24d3949 Fix trans 2020-04-11 12:42:08 +02:00
Laurent Destailleur
d8e0036817 css 2020-04-11 12:41:53 +02:00
Laurent Destailleur
9ab2adab7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-11 00:56:29 +02:00
Laurent Destailleur
db30f0bbc4 NEW Receipt printer module moved from 'development' to 'experimental' 2020-04-11 00:56:18 +02:00
Laurent Destailleur
b3beb42857
Merge pull request #13561 from andreubisquerra/master
Up to 2 orders printers in TakePOS with Receipt printers module
2020-04-10 20:06:35 +02:00
Laurent Destailleur
eb3ed7ffdf Complete index on tickets 2020-04-10 20:02:57 +02:00
Laurent Destailleur
2cebffbc94
Merge pull request #13558 from philazerty/patch-10
Index optimization for ticket
2020-04-10 20:00:07 +02:00
Laurent Destailleur
6960f79e40
Update llx_ticket.key.sql 2020-04-10 19:59:45 +02:00
andreubisquerra
bcbd7632bf
Fix travis 2020-04-10 19:49:59 +02:00
jove@bisquerra.com
66659f0693 Two diferents order printers 2020-04-10 19:18:42 +02:00
philazerty
0aab98abff
Index optimization for ticket
When there are a lot of tickets, the search can be long without these indexes.
2020-04-10 17:05:53 +02:00
Laurent Destailleur
267677a925 Fix phpcs 2020-04-10 14:02:35 +02:00
Laurent Destailleur
f7726cd366 Try to disable a not expected rule 2020-04-10 13:04:30 +02:00
Laurent Destailleur
d75f1138ba Fix phpcs 2020-04-10 13:00:46 +02:00
Laurent Destailleur
069fb27ced Look and feel v12 2020-04-10 12:27:34 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
add  in default search
2020-04-10 12:12:28 +02:00
Laurent Destailleur
da8cf3dcb0
Update list.php 2020-04-10 12:11:09 +02:00
Anthony Berton
174ef23207
Update list.php 2020-04-10 12:09:04 +02:00
Laurent Destailleur
68022fb916 css 2020-04-10 12:08:37 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used
#13547
2020-04-10 11:54:14 +02:00
Laurent Destailleur
8567001a46
Merge pull request #13549 from oscim/patch-34
Update llx_societe_rib.key.sql
2020-04-10 11:11:13 +02:00
Laurent Destailleur
87dbf92f6b
Merge pull request #13551 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2020-04-10 11:04:43 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Anthony Berton
96f1c961b7
Update list.php 2020-04-10 10:55:14 +02:00
Laurent Destailleur
a2a89637a2 Fix phpcs 2020-04-10 10:53:41 +02:00
Laurent Destailleur
e454ee783f Fix phpcs 2020-04-10 10:53:03 +02:00
Anthony Berton
8abef71616
Update list.php 2020-04-10 10:50:15 +02:00
Anthony Berton
620161f0e7
Update list.php 2020-04-10 10:47:34 +02:00
Anthony Berton
a7440687ec
Update list.php 2020-04-10 10:38:31 +02:00
oscim
2887ae3f00
Update llx_societe_rib.key.sql
fix key in table
2020-04-10 08:54:39 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
92cd0372db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:01:31 +02:00
Laurent Destailleur
6f4ff57612 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/supplier_proposal/list.php
2020-04-10 02:00:22 +02:00
Laurent Destailleur
5a366767fb Fix phpcs 2020-04-10 01:47:50 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
2020-04-10 01:22:22 +02:00
Laurent Destailleur
273443550e Fix list in warehouse 2020-04-10 01:21:59 +02:00
Laurent Destailleur
f7d1ce1e09 FIX Can use decimal value in virtual products 2020-04-10 00:26:09 +02:00
Laurent Destailleur
401b8b2dcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-10 00:25:41 +02:00
Laurent Destailleur
80862f7173 FIX Can use decimal value in virtual products 2020-04-10 00:25:30 +02:00
Laurent Destailleur
635cd7a995
Merge pull request #13531 from defrance/patch-149
add linked object block
2020-04-09 20:44:02 +02:00
Laurent Destailleur
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
Display Phone link and  separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
cbbd2399c0
Update list.php 2020-04-09 19:50:24 +02:00
Laurent Destailleur
1ed8639653
Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +02:00
Laurent Destailleur
f52f59e80a
Merge pull request #13540 from atm-gauthier/10.0_quote
FIX : IHM, unexpected quote
2020-04-09 19:43:39 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37:48 +02:00