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
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
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
Laurent Destailleur
2788a352cf
Missing lang loading
2015-01-31 19:00:00 +01:00
Laurent Destailleur
ce8ad39a8e
Remove test code and restore prod code.
2015-01-31 13:00:51 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
AcceTT Soluciones Computacionales
608b099934
Currency symbol in Mexico
...
I tried to change the order of the currency symbol in Mexico is before.
2015-01-26 21:38:43 -06:00
Laurent Destailleur
ffde00de81
Fixed date change was lost when changing event assignement.
2015-01-26 10:31:41 +01:00
Laurent Destailleur
57c84089fe
Introduce warning to remind to do a backup before migration.
...
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
3ebaaa38d2
Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC
2015-01-25 16:04:37 +01:00
Laurent Destailleur
a4990a58b1
The badge was missing for shipment
2015-01-23 18:39:40 +01:00
Laurent Destailleur
0f7238937a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/fiche.php
2015-01-22 18:55:26 +01:00
Laurent Destailleur
31be2563c2
Fixed: Allow external module a chance to fix regression.
2015-01-22 12:29:55 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0
add left joins on llx_c_actiocomm
2015-01-20 17:26:32 +01:00
Laurent Destailleur
9876b30387
Need more info to find bugs
2015-01-17 16:22:37 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +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
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a886136e67
More comment and add a unit test to check that {t} tag is correctly
...
supported.
2015-01-13 22:13:15 +01:00
