Laurent Destailleur
88356e2e97
Add a new rule on contributing when adding a new table.
2015-11-13 14:32:40 +01:00
Laurent Destailleur
8068d01cfc
Add style maxwidth150
2015-11-13 14:16:45 +01:00
Laurent Destailleur
5e67eefff3
Removed phpcs warning
2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
bad28c6d92
Fi sntax error
2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
Laurent Destailleur
c7546dbad2
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd
Fix syntax error . = instead of .=
2015-11-13 11:12:49 +01:00
Laurent Destailleur
682842f15f
Fix into title of login page, we must report the tru dolibarr version
...
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +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
f65829ec42
Merge pull request #3970 from hregis/3.7_bug
...
Fix: wrong var name
2015-11-12 18:33:12 +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
Laurent Destailleur
816bacc37e
Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order
...
FIX export propal and order with extrafields
2015-11-12 18:31:59 +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
924db5b8aa
Merge pull request #3969 from FHenry/3.8
...
FIX : better fix for #3805
2015-11-12 15:08:34 +01:00
Laurent Destailleur
8925717bbe
Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
...
FIX mail isn't display in title on event in mode view
2015-11-12 15:07:29 +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
9a9be97c2c
Add a log to help diagnose bad usage of method ad of event
2015-11-12 14:36:35 +01:00
Regis Houssin
52bd90f950
Fix: wrong var name
2015-11-12 14:12:56 +01:00
Florian HENRY
019575d9ed
FIX : better fix for #3805
2015-11-12 13:21:35 +01:00
arnaud
aaa6f00d11
FIX export propal and order with extrafields
2015-11-12 12:37:04 +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
phf
f041c017e9
FIX mail isn't display in title on event in mode view
2015-11-12 11:30:44 +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
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
