Commit Graph

70086 Commits

Author SHA1 Message Date
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies
Dolibarization DataPolicies
2018-10-09 16:03:14 +02:00
Laurent Destailleur
46ad7de5dd
Merge pull request #9709 from bafbes/abb80031
NEW Category filter on user list
2018-10-09 15:38:00 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a Update auguria menu 2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91 Fix translation 2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7 FIX Menu to show/edit Users categories was missing 2018-10-09 14:41:21 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
Laurent Destailleur
a2a53a32f1 FIX Look and feel v8. Missing button "Create category" 2018-10-09 14:34:25 +02:00
Abbes Bahfir
073914572c Fix: users categories type is Categorie::TYPE_USER 2018-10-09 14:24:41 +02:00
Laurent Destailleur
966e97617d
Merge pull request #9708 from bafbes/abb80030
FIX users categories type is Categorie::TYPE_USER
2018-10-09 14:24:21 +02:00
Laurent Destailleur
f365a987c4 FIX restore last seach criteria
FIX filter on employee
2018-10-09 14:20:53 +02:00
Abbes Bahfir
603c70ffc7 Fix: Searching on employee field disables employee mode 2018-10-09 14:10:04 +02:00
Laurent Destailleur
362c226ad6
Merge pull request #9710 from bafbes/abb80032
Fix: Searching on employee field disables employee mode
2018-10-09 14:09:23 +02:00
Laurent Destailleur
f3647c45e6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-09 14:06:56 +02:00
Laurent Destailleur
4d959bbea7 Fix consistency of label of proposal status 2018-10-09 14:06:45 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Laurent Destailleur
6a1610cdef
Merge pull request #9705 from ebzao/patch-1
fix bank ref override "bordereau cheque" ref
2018-10-09 12:44:18 +02:00
Laurent Destailleur
bc4ddce314
Merge pull request #9713 from frederic34/patch-9
Update index.php
2018-10-09 12:43:32 +02:00
Laurent Destailleur
398603c789
Merge pull request #9696 from IAS-SYSTEMS-CSC/develop
new malay lang tag
2018-10-09 12:40:26 +02:00
Laurent Destailleur
1297f25468
Merge pull request #9690 from grandoc/new_branch_05_10_2018
clean code
2018-10-09 12:40:03 +02:00
Frédéric FRANCE
b615d03b0b
Update index.php 2018-10-09 12:17:51 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Philippe GRAND
6ea115f828 Standardize code 2018-10-09 09:04:27 +02:00
Philippe GRAND
6a6df629b2 Standardize code 2018-10-09 08:56:58 +02:00
Philippe GRAND
ac214a7258 Standardize code 2018-10-09 08:53:08 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270 NEW Can filter on EEC, not EEC, etc... in binding step of accountancy 2018-10-09 01:47:37 +02:00
Abbes Bahfir
34da7cc731 Fix: Searching on employee field disables employee mode 2018-10-09 00:25:55 +01:00
Laurent Destailleur
6ded9e843d NEW The binding step in accountancy has a country filter like a combo 2018-10-09 01:03:46 +02:00
Abbes Bahfir
06a943fc80 Fix: Category filter on user list 2018-10-09 00:02:14 +01:00
Abbes Bahfir
1e706c2e6b Fix: users categories type is Categorie::TYPE_USER 2018-10-08 23:50:14 +01:00
Laurent Destailleur
35d5a495de Save pos_source with id of POS station 2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14 New : Add FEC Export in accountancy 2018-10-08 21:01:21 +02:00
Laurent Destailleur
923b561aff FIX Option for prof id mandatory not working with custom type of company 2018-10-08 20:01:45 +02:00
Laurent Destailleur
91038af84d FIX properties on proposal must not be modified if error 2018-10-08 18:15:46 +02:00
Inovea Conseil
61f35f11c0 Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-10-08 17:45:01 +02:00
Laurent Destailleur
c930218dd2 FIX Missing transaction around action 2018-10-08 17:40:17 +02:00
Nicolas Aupetit
c26fe00362
fix bank ref override "bordereau cheque" ref 2018-10-09 02:15:38 +11:00
Laurent Destailleur
44d0ed7a0c Introduce SOCIETE_SHOW_FIELD_IN_TOOLTIP for fields to show in tooltip 2018-10-08 15:13:01 +02:00
Laurent Destailleur
0c7b7ed7f4 FIX Required extrafield value numeric should accept '0' 2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e Fix translation of source of proposals 2018-10-08 14:04:22 +02:00
Laurent Destailleur
08ca85e995 Fix type 2018-10-08 02:19:32 +02:00
Laurent Destailleur
d776fc423e Fix search criterai of contract 2018-10-08 00:52:21 +02:00
Laurent Destailleur
9f5e44c568 Fix search criterai of contract 2018-10-08 00:51:08 +02:00
Laurent Destailleur
df7f218d01 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd Fix regression into backup feature 2018-10-07 21:45:20 +02:00
Laurent Destailleur
b61f3b4313 Look and feel v8 2018-10-07 17:31:35 +02:00