Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Laurent Destailleur
01541e4152
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe
Fix pb into date management.
...
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Laurent Destailleur
75f451ccc7
Fix class not found
2015-02-03 08:59:57 +01:00
Marcos García de La Fuente
0c63644038
Fix: [ bug #1819 ] SQL error when searching for an invoice payment
2015-02-01 13:26:30 +01:00
Laurent Destailleur
87b75126aa
Fix missing set into specimen
2015-01-31 16:52:34 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
8fb6ade27a
Fix drag and drop in agenda view
2015-01-25 17:49:11 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
frederic34
925aa2039b
Tooltip and cache for boxes
2015-01-23 10:51:12 +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
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
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Frédéric FRANCE
229f7888ca
Update index.php
2015-01-19 20:38:33 +01:00
Frédéric FRANCE
2d911e1a8f
Update card.php
2015-01-19 20:19:36 +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
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
Marcos García de La Fuente
fb186d6ef8
Added delay between mails in Newsletter module
2015-01-18 16:26:26 +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
b3e216b8f1
Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1787
Conflicts:
ChangeLog
htdocs/comm/propal.php
2015-01-18 15:06:54 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Laurent Destailleur
ef802d9c39
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a
Fixed: Better fix for backward compatibility
2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c
Fixed: Backward compatibility
2015-01-18 11:50:53 +01:00
Laurent Destailleur
b53b8d2e45
Fixed: Backward compatibility
2015-01-18 11:48:52 +01:00
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
ed839114ab
Fixed loading of external numeration modules in FactureFournisseur and Propal
2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
a64084308d
Fix: [ bug #1804 ] SQL error when sending email without addresee
2015-01-17 18:12:43 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
30abacd0a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 14:42:42 +01:00
Laurent Destailleur
8cd46e4830
Introduce option MAIN_HTML_TITLE to start to control format of html
...
title content.
2015-01-17 14:34:16 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
d16ce7eb96
Fix: Bad var
2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319
Fixed: Export was not using user assigned
2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
806477977d
Fix: css
2015-01-14 13:51:21 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
