Commit Graph

85416 Commits

Author SHA1 Message Date
Laurent Destailleur
52b467d2fc FIX #13550 Removed not used table 2020-04-12 19:06:44 +02:00
Laurent Destailleur
b6baba7651 Removed deprecated var 2020-04-12 18:59:22 +02:00
Laurent Destailleur
4bfc900798 Look and feel v12 2020-04-12 18:41:42 +02:00
Laurent Destailleur
a2cc7aca1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-12 18:36:32 +02:00
Laurent Destailleur
239ae78b28 Look and feel v12 2020-04-12 18:36:22 +02:00
Laurent Destailleur
8aa6ce0098
Merge pull request #13587 from frederic34/patch-1
The variable $rep seems to be never defined.
2020-04-12 18:19:40 +02:00
Laurent Destailleur
d47c566c4d Fix class not found 2020-04-12 18:15:38 +02:00
Laurent Destailleur
92b6b1a042 Look and feel v12 2020-04-12 18:13:43 +02:00
Frédéric FRANCE
ea78fc48a8
The variable $rep seems to be never defined. 2020-04-12 18:03:51 +02:00
Laurent Destailleur
ecd49c21c9 Look and feel v12 2020-04-12 17:32:22 +02:00
Laurent Destailleur
e18d6bd6b8 Look and feel v12 2020-04-12 17:28:10 +02:00
Laurent Destailleur
313df360b2
Merge pull request #13566 from atm-maxime/new_user_bank_mgmt
New display of user bank account : same way as on thirdparty
2020-04-12 17:22:01 +02:00
Laurent Destailleur
38a8cf9bc9
Merge pull request #13575 from frederic34/catmod
NEW Show creator, last update user of category/tag in the infoirmation tab
2020-04-12 17:21:04 +02:00
Laurent Destailleur
4a6ffd2619
Merge pull request #13570 from frederic34/patch-6
Add table_ref_field to facture-rec class
2020-04-12 17:17:43 +02:00
Laurent Destailleur
08301e2696
Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove
Remove expense report tab from user
2020-04-12 17:11:37 +02:00
Laurent Destailleur
b2cf5ee9a8
Merge pull request #13572 from frederic34/patch-8
can't remove actioncomm if there is a category
2020-04-12 17:09:27 +02:00
stickler-ci
a873afdad9 Fixing style errors. 2020-04-12 15:08:44 +00:00
Laurent Destailleur
51f73526f9
Merge branch 'develop' into patch-8 2020-04-12 17:07:57 +02:00
Laurent Destailleur
fe4cd2e7bc
Update actioncomm.class.php 2020-04-12 17:05:12 +02:00
Laurent Destailleur
27782a244c
Merge pull request #13565 from andreubisquerra/develop
4 rows of actions buttons in TakePOS
2020-04-12 17:02:28 +02:00
Laurent Destailleur
78b455e42a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-12 17:01:53 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
8e246f2a18 Prepare 11.0.4 2020-04-12 16:54:54 +02:00
Laurent Destailleur
acbbffdb7f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 16:54:15 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
94ae75c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:52:58 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Laurent Destailleur
b1bae5f3dd
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList
Keep compatibility with old object declaration
2020-04-12 16:48:08 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
Laurent Destailleur
e9ee7a23e6
Merge pull request #13573 from frederic34/patch-11
Update actioncomm.class.php
2020-04-12 16:42:07 +02:00
Laurent Destailleur
faa9b98b39
Merge pull request #13571 from frederic34/patch-7
Add table_ref_field to fichinterrec class
2020-04-12 16:41:48 +02:00
Laurent Destailleur
b3d58ededd
Merge pull request #13577 from frederic34/patch-13
Update llx_blockedlog.sql
2020-04-12 16:41:14 +02:00
Laurent Destailleur
b60ed2ca05
Merge pull request #13574 from andreubisquerra/master
TakePOS connector update
2020-04-12 16:39:44 +02:00
Laurent Destailleur
3cc68c6972
Merge pull request #13579 from atm-maxime/fix_variants_links
Fix #13576 : links on variants
2020-04-12 16:38:56 +02:00
Laurent Destailleur
a38e273ae8
Merge pull request #13583 from atm-maxime/fix_default_workdayhour
Fix #13468 setup working days and hours
2020-04-12 16:38:36 +02:00
Laurent Destailleur
51eea01505
Merge pull request #13584 from pstructures/develop
Installation issue
2020-04-12 16:38:08 +02:00
Laurent Destailleur
4640eb3fe2
Merge pull request #13578 from frederic34/patch-14
Update llx_categorie_website_page.key.sql
2020-04-12 16:37:43 +02:00
Laurent Destailleur
ba2c035556
Merge pull request #13580 from atm-maxime/fix_composition_token
Fix missing token on product composition
2020-04-12 16:36:48 +02:00
Laurent Destailleur
d842c7d603
Merge pull request #13585 from frederic34/patch-15
doxygen
2020-04-12 16:36:37 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Frédéric FRANCE
044a6192b6
doxygen 2020-04-12 16:26:19 +02:00
Matt Sidnell
7c72e40659
Installation issue
Installation SQL issue due to a ';' instead of a ','.
2020-04-12 15:21:14 +01:00
Maxime Kohlhaas
20e684ec69 Fix #13468 setup working days and hours 2020-04-12 15:30:58 +02:00
Laurent Destailleur
0916017519 Fix addreplace hook 2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1 More font awesome picto 2020-04-12 14:58:50 +02:00
Laurent Destailleur
6b16a3ad39 NEW Can check all events in one click in setup of audited events 2020-04-12 13:25:19 +02:00
Maxime Kohlhaas
8bca68cfba Fix missing token on product composition 2020-04-12 10:39:16 +02:00
Maxime Kohlhaas
3f59ca6418 Fix #13576 : links on variants 2020-04-12 10:13:37 +02:00