Laurent Destailleur
1ca4e377d5
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-20 23:47:09 +01:00
Laurent Destailleur
41196c01e9
Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not
...
accepting all html tags from templates.
2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
d46c76311c
Correction
2015-02-20 10:23:17 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
3cf4b80baa
Fix missing test of action when using canvas
2015-02-16 02:02:11 +01:00
Laurent Destailleur
eef1e17c61
Fix: default vat
2015-02-15 19:38:20 +01:00
Marcos García de La Fuente
2c074a94f3
Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error
2015-02-15 15:57:38 +01:00
Marcos García de La Fuente
530186c59d
PHPDoc and misc fixes for several folders
2015-02-10 13:32:00 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
ca939bf8a5
PHPDoc and misc fixes for several folders
2015-02-10 11:02:11 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Laurent Destailleur
90fdc29d5e
Fix restore compatibility
2015-02-07 17:41:20 +01:00
Laurent Destailleur
35129f2192
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
...
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
Laurent Destailleur
96215ccea5
Fix bad operator for and
2015-02-03 13:05:28 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
Laurent Destailleur
e14684c417
Merge pull request #2259 from marcosgdf/misc-fixes
...
misc-fixes
2015-01-19 15:28:28 +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
55b8c28100
Corrected weird typo
2015-01-18 16:28:42 +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
Marcos García de La Fuente
dacec491ff
Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
068045f6a0
Fix: [ bug #1803 ] AJAX company contact input is not aligned
2015-01-17 18:23:20 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
ef4d710f78
Improving CommonObject and Contrat documentation
2014-12-28 19:16:14 +01:00
Laurent Destailleur
3c500158a9
Merge pull request #2187 from marcosgdf/bug-1715
...
Fix [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-26 04:02:46 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Laurent Destailleur
54437703fb
Merge pull request #2177 from frederic34/patch-7
...
Enhance select_salesrepresentatives with select2
2014-12-26 03:49:43 +01:00
Marcos García de La Fuente
2616deb58d
Copyright info
2014-12-25 22:52:11 +01:00
Marcos García de La Fuente
eb524cfd29
Copyright info
2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-25 22:50:15 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Marcos García de La Fuente
1179f722af
Merge branch '3.7' into bug-1533
2014-12-25 01:26:00 +01:00
Frédéric FRANCE
d03cc03cd7
Enhance select_salesrepresentatives with select2
2014-12-23 16:42:05 +01:00
Laurent Destailleur
acf7b9f130
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
8a14409974
Fix: [ bug #1533 ] Links triggers do not show trigger error message
2014-12-23 11:39:43 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
22c27e8703
PHPCS
2014-12-21 02:21:12 +01:00
Laurent Destailleur
268723be7b
Fixed: sql syntax error
2014-12-21 01:39:20 +01:00
Laurent Destailleur
c9f3267649
Fixed: bad conditions
2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Laurent Destailleur
ef5035b349
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/liste.php
2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
Laurent Destailleur
f5da9b5e33
Merge pull request #2149 from altatof/3.5
...
FIX: dont put a mess with date and datetime extrafield value if already in right format
2014-12-18 10:04:03 +01:00
Laurent Destailleur
6728ad3c37
Merge pull request #2148 from altatof/fixhook
...
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
2014-12-18 10:03:32 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Christophe Battarel
27b47a4f48
FIX: dont put a mess with date and datetime extrafield value if already
...
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
2014-12-12 14:31:36 +01:00
Christophe Battarel
a1bba472a0
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
2014-12-12 11:57:20 +01:00
Laurent Destailleur
c994fbe44d
Fixed: Bad style
2014-12-11 14:31:47 +01:00
