Laurent Destailleur
|
eedca43cc3
|
New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines
into refering project view.
|
2015-01-22 21:31:00 +01:00 |
|
Laurent Destailleur
|
7b8b189bac
|
Fix: select if field is null
|
2015-01-22 20:09:57 +01:00 |
|
Laurent Destailleur
|
c4782f960c
|
Qual: Removed not cleand function
|
2015-01-22 19:47:53 +01:00 |
|
Laurent Destailleur
|
321e46e596
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-01-22 18:35:55 +01:00 |
|
Laurent Destailleur
|
5c007e53be
|
Update sample examples
|
2015-01-22 18:35:02 +01:00 |
|
Laurent Destailleur
|
78e90493ed
|
Merge pull request #2269 from frederic34/tooltip
Add tooltip in getNomUrl link
|
2015-01-22 13:58:20 +01:00 |
|
frederic34
|
12c8d4ba1f
|
Merge remote branch 'upstream/develop' into tooltip
|
2015-01-22 00:44:50 +01:00 |
|
frederic34
|
f4161b457b
|
Add dol_escape_htmltag and start to adapt boxes
|
2015-01-22 00:23:55 +01:00 |
|
Laurent Destailleur
|
017a483eb3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-01-21 00:06:03 +01:00 |
|
Laurent Destailleur
|
59ef42cd52
|
Merge branch 'marcosgdf-delay-emailing' into develop
|
2015-01-21 00:05:36 +01:00 |
|
Laurent Destailleur
|
449f2b9346
|
Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr
into marcosgdf-delay-emailing
Conflicts:
htdocs/comm/mailing/card.php
|
2015-01-21 00:05:19 +01:00 |
|
Laurent Destailleur
|
da75877caa
|
Merge pull request #2264 from frederic34/patch-2
Use getNomUrl on every list to uniformize display
|
2015-01-21 00:03:21 +01:00 |
|
Laurent Destailleur
|
25194c4caf
|
Merge pull request #2268 from frederic34/patch-4
Type of supplier invoice was broken
|
2015-01-21 00:02:23 +01:00 |
|
Laurent Destailleur
|
9f00f5d525
|
Merge pull request #2265 from frederic34/patch-3
Use css badge
|
2015-01-21 00:00:32 +01:00 |
|
frederic34
|
1b0dd671b3
|
Add tooltip in getNomUrl link
|
2015-01-20 21:40:33 +01:00 |
|
Frédéric FRANCE
|
3ab6ac601e
|
Type of supplier invoice was broken
|
2015-01-20 17:55:20 +01:00 |
|
Frédéric FRANCE
|
229f7888ca
|
Update index.php
|
2015-01-19 20:38:33 +01:00 |
|
Frédéric FRANCE
|
fb9f53010f
|
Update index.php
|
2015-01-19 20:36:38 +01:00 |
|
Frédéric FRANCE
|
0a41a025ae
|
Update index.php
|
2015-01-19 20:35:29 +01:00 |
|
Frédéric FRANCE
|
2d911e1a8f
|
Update card.php
|
2015-01-19 20:19:36 +01:00 |
|
Frédéric FRANCE
|
1fc9517200
|
Use css badge
|
2015-01-19 19:18:57 +01:00 |
|
Frédéric FRANCE
|
e82301e001
|
Update card.php
|
2015-01-19 19:07:34 +01:00 |
|
Frédéric FRANCE
|
388697b73e
|
Use getNomUrl on every list to uniformize display
|
2015-01-19 18:55:55 +01:00 |
|
Laurent Destailleur
|
67debbe37d
|
Merge pull request #2262 from FHenry/develop
add extrafield type, check box from table
|
2015-01-19 15:30:14 +01:00 |
|
Florian HENRY
|
a4561ab4ad
|
merge
|
2015-01-19 09:41:31 +01:00 |
|
Florian HENRY
|
ab50437331
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/html.form.class.php
|
2015-01-19 09:38:00 +01:00 |
|
Laurent Destailleur
|
667565f04f
|
Fix missing table in migration script
|
2015-01-19 02:38:24 +01:00 |
|
Laurent Destailleur
|
fdaa930507
|
Solve phpunit.
Fix database field format
|
2015-01-19 01:58:48 +01:00 |
|
Laurent Destailleur
|
3554624537
|
Fix: A method must not change value of original property.
|
2015-01-18 23:32:13 +01:00 |
|
Laurent Destailleur
|
47baf232d4
|
Fix: A method must not change value of original property.
|
2015-01-18 23:02:53 +01:00 |
|
Laurent Destailleur
|
f96fdc7d0a
|
Regression solved
|
2015-01-18 21:04:39 +01:00 |
|
Laurent Destailleur
|
28148f8637
|
Fixed: Bad sql requests
|
2015-01-18 20:49:57 +01:00 |
|
Laurent Destailleur
|
e220ce5a82
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
|
2015-01-18 18:44:22 +01:00 |
|
Laurent Destailleur
|
5c5ff72ecd
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
|
2015-01-18 17:13:42 +01:00 |
|
Florian HENRY
|
e872c40cc7
|
fix class actioncomm for travis and feature userassigned
|
2015-01-18 16:44:53 +01:00 |
|
Marcos García de La Fuente
|
fb186d6ef8
|
Added delay between mails in Newsletter module
|
2015-01-18 16:26:26 +01:00 |
|
Florian HENRY
|
d6778b9ed6
|
fix travis
|
2015-01-18 16:25:43 +01:00 |
|
Florian HENRY
|
b171975d18
|
Fix travis
|
2015-01-18 16:08:10 +01:00 |
|
Florian HENRY
|
22c253cfc1
|
add extrafield type, check box from table
|
2015-01-18 16:02:31 +01:00 |
|
Laurent Destailleur
|
08214999a7
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-01-18 15:21:38 +01:00 |
|
Laurent Destailleur
|
959fe14856
|
Merge pull request #2256 from marcosgdf/bug-1735
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
|
2015-01-18 15:14:23 +01:00 |
|
Laurent Destailleur
|
5ed5a729d5
|
Merge branch 'marcosgdf-bug-1784' into 3.6
|
2015-01-18 15:13:38 +01:00 |
|
Laurent Destailleur
|
7b7b8f376f
|
Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1784
Conflicts:
ChangeLog
|
2015-01-18 15:13:26 +01:00 |
|
Laurent Destailleur
|
a696ad62c3
|
Merge branch 'marcosgdf-bug-1717' into 3.6
|
2015-01-18 15:12:30 +01:00 |
|
Laurent Destailleur
|
ff65035aee
|
Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1717
Conflicts:
ChangeLog
|
2015-01-18 15:12:00 +01:00 |
|
Laurent Destailleur
|
5ec7b10dc7
|
Merge branch 'marcosgdf-bug-1783' into 3.6
|
2015-01-18 15:10:47 +01:00 |
|
Laurent Destailleur
|
d1e2ab6f56
|
Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1783
Conflicts:
ChangeLog
|
2015-01-18 15:10:30 +01:00 |
|
Laurent Destailleur
|
a0de75c727
|
Merge branch 'marcosgdf-bug-1796' into 3.6
|
2015-01-18 15:09:18 +01:00 |
|
Laurent Destailleur
|
7c5927ef93
|
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1796
Conflicts:
ChangeLog
|
2015-01-18 15:08:49 +01:00 |
|
Laurent Destailleur
|
abf961707d
|
Merge branch 'marcosgdf-bug-1787' into 3.6
|
2015-01-18 15:07:15 +01:00 |
|