fmarcet
077a9c6510
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-04 09:22:55 +02:00
Laurent Destailleur
92f2c48475
Fixed #2714
2015-04-27 11:46:08 +02:00
Florian HENRY
32e067c806
Remove debug
2015-04-16 14:22:48 +02:00
Laurent Destailleur
e508b28d74
Fix doliforge bug 1707
2015-04-15 18:53:39 +02:00
Laurent Destailleur
8511f1f7ef
Fix the data-role parameter
2015-04-15 18:14:26 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
6889162d7a
Fix: management of vat type 2, 4 and 6 is now ok.
...
Works for canada and ivory cost.
2015-04-11 22:51:53 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Laurent Destailleur
73266bb965
Fix error when using a log hangler that make output into the http
...
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
bc3f9bf800
Fix: the visible version was not enough to know version of dolibarr. We
...
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
895b2c6e9c
Fix bad merge
2015-03-13 14:37:27 +01:00
Marcos García de La Fuente
41c55d1913
Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value
2015-03-04 11:55:17 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
Marcos García de La Fuente
7876238823
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
...
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
2015-03-02 01:36:27 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Marcos García de La Fuente
0a5f17f179
Undefined variable + Unreachable statement
2015-02-25 18:06:54 +01:00
Marcos García de La Fuente
91fa823075
Marked getStaticMember as deprecated
2015-02-25 18:03:31 +01:00
Laurent Destailleur
72da9b52af
Merge pull request #2380 from marcosgdf/bug-1825
...
Better fix for bug 1825
2015-02-24 17:07:17 +01:00
Laurent Destailleur
938936b8f2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/core/lib/functions.lib.php
2015-02-20 22:51:47 +01:00
Laurent Destailleur
e1e31de229
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-02-20 20:15:04 +01:00
Marcos García de La Fuente
3a917a0d1f
Merge branch '3.6' into bug-1825
2015-02-20 10:19:08 +01:00
Marcos García de La Fuente
fd18aa8717
Better fix for Bug #1825
2015-02-20 10:17:02 +01:00
Laurent Destailleur
639aaebacb
Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825
Conflicts:
ChangeLog
2015-02-19 09:47:22 +01:00
Laurent Destailleur
ec56667f5e
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
...
country set
2015-02-19 09:44:22 +01:00
Laurent Destailleur
d1a4b6c2c5
phpcs
2015-02-19 00:04:35 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +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
1e78d0e8d4
New: Introduce hidden option
...
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
2015-02-16 20:46:54 +01:00
Marcos García de La Fuente
3efb737cbf
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016
Fix: [ bug #1846 ] Browser IE11 not detected
2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
0a81fe667f
Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
2015-02-16 10:44:10 +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
Marcos García de La Fuente
e485dd413d
PHPDoc and misc fixes for several folders
2015-02-10 13:41:59 +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
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
Marcos García de La Fuente
0d150b1d32
Removed unused code, misc corrections and corrected PHPDoc problems.
2015-02-10 10:25:59 +01:00
Marcos García de La Fuente
58a61e1294
Changed int typecast to float
2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
2015-02-10 00:20:47 +01:00
Laurent Destailleur
e8b2b22c32
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1827
Conflicts:
ChangeLog
2015-02-07 23:56:38 +01:00
Laurent Destailleur
553181a5d9
Fixed: Location for file storage from tab attached files was not at same
...
place than from tab images.
2015-02-06 21:26:41 +01:00
Marcos García de La Fuente
b8b9df7b95
Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
2015-02-06 12:36:09 +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
Raphaël Doursenaud
fb865e8184
FIXED Removed deprecated forcing SSLv3 for CURL
...
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
Laurent Destailleur
7809013b96
Message is more clear.
2015-02-02 13:33:16 +01:00
Laurent Destailleur
6976aec04b
Merge pull request #2289 from accett/patch-2
...
Currency symbol in Mexico
2015-01-31 19:40:57 +01:00
