Commit Graph

85315 Commits

Author SHA1 Message Date
Tobias Sekan
b710f5e876
Merge pull request #13 from Dolibarr/develop
pull from develop
2020-04-10 12:29:26 +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
Laurent Destailleur
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
56336e1d30
Merge pull request #13541 from fappels/11_stock_list_default_vis
Fix set default warehouse list columns
2020-04-09 19:35:18 +02:00
Laurent Destailleur
c83f0f7484
Merge pull request #13533 from simicar29/11.0
11.0
2020-04-09 19:34:31 +02:00
Laurent Destailleur
6202b0a391
Merge pull request #13528 from bb2a/patch-3
Link Mail in list
2020-04-09 19:33:10 +02:00
Laurent Destailleur
2e3d4f03b6
Merge pull request #13544 from andreubisquerra/develop
FIX TakePOS buying price
2020-04-09 19:30:53 +02:00
Laurent Destailleur
2ac03c2875
Merge pull request #13545 from fappels/fix_photos_on_shipment_docs
FIX print pictures on shipment docs
2020-04-09 19:30:31 +02:00
Laurent Destailleur
f1c391363d Fix label 2020-04-09 18:40:00 +02:00
Laurent Destailleur
6a60678186 Look and feel v12 2020-04-09 16:36:39 +02:00
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13 2020-04-09 14:58:42 +02:00
andreubisquerra
e43e9a0daa
FIX TakePOS buying price 2020-04-09 14:56:50 +02:00
atm-lena
c9ab61b521 FIX - Add function "completeTabsHead" to hooks "addreplace" 2020-04-09 14:54:47 +02:00
Francis Appels
caecb0152f Fix set default warehouse list columns 2020-04-09 14:46:20 +02:00