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 |
|
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 |
|
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
|
ccaab5e183
|
Merge branch 'marcosgdf-bug-1803' into 3.6
|
2015-01-18 15:01:34 +01:00 |
|
Laurent Destailleur
|
c35de1aa06
|
Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1803
Conflicts:
ChangeLog
|
2015-01-18 15:01:18 +01:00 |
|
Laurent Destailleur
|
839f73d568
|
Update doc
|
2015-01-18 14:57:25 +01:00 |
|
Laurent Destailleur
|
c1f3d66686
|
Merge branch 'marcosgdf-bug-1804' into 3.6
|
2015-01-18 14:03:04 +01:00 |
|
Laurent Destailleur
|
cef48d1275
|
Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1804
Conflicts:
ChangeLog
|
2015-01-18 14:02:52 +01:00 |
|
Laurent Destailleur
|
cf3a8f5a71
|
Merge pull request #2245 from KreizIT/fix_defaultE37
Fix Creating default object from empty on supplier order confirmation
|
2015-01-18 14:01:57 +01:00 |
|
Laurent Destailleur
|
0513ce25e5
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Conflicts:
ChangeLog
|
2015-01-18 13:51:45 +01:00 |
|
Laurent Destailleur
|
056c0b0ca1
|
Merge branch 'marcosgdf-bug-1788' into 3.6
|
2015-01-18 13:49:23 +01:00 |
|
Laurent Destailleur
|
a51ea308f5
|
Merge branch 'marcosgdf-bug-1762' into 3.5
|
2015-01-18 13:46:15 +01:00 |
|
Laurent Destailleur
|
3db231cea6
|
Merge pull request #2232 from defrance69/patch-43
Update commondocgenerator.class.php
|
2015-01-18 13:45:50 +01:00 |
|
Laurent Destailleur
|
8644407c0a
|
Merge pull request #2230 from defrance69/patch-42
Update card.php
|
2015-01-18 13:44:35 +01:00 |
|
Laurent Destailleur
|
05f08a7181
|
Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1762
Conflicts:
ChangeLog
|
2015-01-18 13:43:57 +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 |
|
frederic34
|
d45750d914
|
Ignore content of directory custom
Conflicts:
htdocs/custom/.gitignore
|
2015-01-18 13:07:39 +01:00 |
|
Laurent Destailleur
|
8ae48217fc
|
Merge pull request #2239 from frederic34/custom
Ignore content of directory custom
|
2015-01-18 12:49:36 +01:00 |
|
Laurent Destailleur
|
b1f889e1d1
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-01-18 12:46:23 +01:00 |
|
frederic34
|
e640a7751a
|
Merge remote branch 'upstream/develop' into custom
|
2015-01-18 12:46:20 +01:00 |
|
Laurent Destailleur
|
896b924380
|
git push origin 3.6Merge branch 'marcosgdf-bug-1785' into 3.6
|
2015-01-18 12:45:29 +01:00 |
|
Laurent Destailleur
|
2f4352c759
|
Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1785
Conflicts:
ChangeLog
|
2015-01-18 12:45:05 +01:00 |
|
Laurent Destailleur
|
19dbf7e2c6
|
Merge pull request #2185 from marcosgdf/bug-1765
Fix: [ bug #1765 ] Unable to create a contract
|
2015-01-18 12:39:25 +01:00 |
|
Laurent Destailleur
|
1a552cf643
|
git push origin 3.6Merge branch 'marcosgdf-bug-1802' into 3.6
|
2015-01-18 12:37:44 +01:00 |
|
Laurent Destailleur
|
4639ce3364
|
Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1802
Conflicts:
ChangeLog
|
2015-01-18 12:37:16 +01:00 |
|
Laurent Destailleur
|
83675daa8a
|
Merge pull request #2255 from frederic34/patch-1
Correct travis error
|
2015-01-18 12:33:51 +01:00 |
|
Laurent Destailleur
|
eaacb3c33b
|
Merge pull request #2257 from IonAgorria/per-entity-smtp
Store per entity SMTP configuration
|
2015-01-18 12:33:08 +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 |
|
Frédéric FRANCE
|
f3a3136452
|
Update html.form.class.php
|
2015-01-18 11:38:45 +01:00 |
|
Laurent Destailleur
|
1681e3b03d
|
Fix: Not allowed types
(http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)
|
2015-01-18 11:36:15 +01:00 |
|
Laurent Destailleur
|
2396f03093
|
Add PHP 5.6 into travis tests
|
2015-01-18 11:21:43 +01:00 |
|
Ion Agorria
|
48c6897f75
|
Store per entity SMTP configuration
|
2015-01-18 03:20:35 +01:00 |
|
Marcos García de La Fuente
|
71e5cf07c6
|
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
|
2015-01-18 03:12:46 +01:00 |
|