aspangaro
0f75d76296
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
778941b549
Merge pull request #3948 from marcosgdf/missing-changes
...
Missing changes of PR #3927
2015-11-13 02:29:56 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
471bcdd29f
Remove hard coded list of permissions.
2015-11-13 02:21:27 +01:00
Laurent Destailleur
ea6fe02f18
Merge pull request #3923 from altatof/customerinfos
...
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
0ca9027459
Merge pull request #3973 from frederic34/patch-3
...
llx_accounting_account ADD INDEX account_number
2015-11-13 00:34:02 +01:00
Laurent Destailleur
e2e804e37a
Minor fix
2015-11-13 00:30:10 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
74a4006a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
b307431348
Add example of email header to use when sending email from thirdparty
...
card
2015-11-12 19:01:57 +01:00
Laurent Destailleur
60535086d4
Merge pull request #3965 from jpfox/patch-2
...
Correct pattern to match all odt var tags
2015-11-12 18:32:45 +01:00
Frédéric FRANCE
bab41e40e7
Update 3.8.0-3.9.0.sql
2015-11-12 17:50:52 +01:00
Frédéric FRANCE
bd7687b6ab
Update llx_accounting_account.key.sql
2015-11-12 17:47:08 +01:00
Laurent Destailleur
8a26e27ef3
Merge pull request #3967 from grandoc/develop
...
[Qual] Uniformize code
2015-11-12 15:01:20 +01:00
Laurent Destailleur
3c70157a7a
Merge pull request #3963 from frederic34/patch-3
...
Typo
2015-11-12 15:00:48 +01:00
Laurent Destailleur
f49a33b600
Try a change for better compatibility with old search form
2015-11-12 12:22:21 +01:00
philippe grand
c712532bf6
[Qual] Uniformize code
2015-11-12 11:59:15 +01:00
Marcos García de La Fuente
3c42df935d
Corrected HTML closing tag
2015-11-12 10:26:05 +01:00
Jean-Pierre Morfin
0cb9cc2213
Correct pattern to match all odt var tags
...
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Alexis Algoud
d997ac83e7
Add function param description
2015-11-12 09:08:08 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
aspangaro
30c4f1c896
HRM : language
2015-11-12 07:40:46 +01:00
aspangaro
bedba7ffb7
HRM: add a mode 'employee' for development to show tab
2015-11-12 07:26:51 +01:00
aspangaro
154f88a58c
HRM: Copy info from user
2015-11-12 07:24:52 +01:00
aspangaro
7693b407e8
HRM: Begin to work on employee card
2015-11-12 06:59:40 +01:00
aspangaro
20872498ba
HRM: Add a tab for holiday module in employee card
2015-11-12 06:58:26 +01:00
aspangaro
4ce6287d52
Merge remote-tracking branch 'Upstream/develop' into develop-hrm3
2015-11-12 05:51:12 +01:00
aspangaro
f602e1fba7
HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)
2015-11-12 05:48:56 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
Frédéric FRANCE
a3e82f5a63
Typo
2015-11-11 20:17:43 +01:00
Laurent Destailleur
1f4742b77b
Remove useles html generated code. More code comment.
2015-11-11 19:38:19 +01:00
Laurent Destailleur
c05e623d97
Update rules to have a better conrol on external libraries and
...
dependencies addition
2015-11-11 19:18:19 +01:00
Laurent Destailleur
cb29f91434
FIX An external libray must contains also non obfuscated code into
...
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
a19f88b664
Merge branch 'GPCsolutions-dolibarr-php7' into develop
2015-11-11 19:05:18 +01:00
Laurent Destailleur
327d764284
Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
...
into GPCsolutions-dolibarr-php7
Conflicts:
.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
9ee06e8f0d
Merge pull request #3951 from frederic34/fccard
...
add messages
2015-11-11 18:32:30 +01:00
Laurent Destailleur
f6a9597507
Merge pull request #3959 from aspangaro/develop-hrm
...
HRM: Correct getNomUrl
2015-11-11 18:32:14 +01:00
Laurent Destailleur
ca62689a96
Merge pull request #3961 from frederic34/escpos
...
Escpos : install lib with composer
2015-11-11 18:30:57 +01:00
frederic34
954291ae0b
re-add library escpos
2015-11-11 18:02:47 +01:00
frederic34
765e83d456
delete directory
2015-11-11 18:01:13 +01:00
frederic34
e107f6d28a
Try to restore escpos
2015-11-11 17:49:37 +01:00
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
01d4bd6cf5
bad invert
2015-11-11 17:19:53 +01:00
Laurent Destailleur
21ca7dc823
Merge pull request #3960 from aspangaro/develop-hrm2
...
HRM: Add fk_establishment in llx_user to link an user to an establish…
2015-11-11 17:08:42 +01:00
Laurent Destailleur
59a79442b0
Enhance code for select field list feature.
...
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
f7f3e16679
I prefer monthly stats
2015-11-11 16:08:21 +01:00
Laurent Destailleur
db6dff998d
Update README
2015-11-11 16:02:41 +01:00
