Laurent Destailleur
d1a4b6c2c5
phpcs
2015-02-19 00:04:35 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +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
frederic34
4bbbff8d69
Add BIC/SWIFT Validation
2015-02-17 22:04:16 +01:00
frederic34
07197f3ca0
Add libs
2015-02-17 11:41:50 +01:00
frederic34
9d0ffb7e85
Add php-iban and check IBAN
2015-02-17 10:23:31 +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
Laurent Destailleur
213c818204
Debug serial/lot management
2015-02-16 20:14:16 +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
aspangaro
05dc308e91
[T1728] Deactivate RIB suggest in proposals/invoices/orders
2015-02-16 06:47:37 +01:00
Laurent Destailleur
2e0b2fb012
Work on expensereport module
2015-02-15 22:49:23 +01:00
Laurent Destailleur
448655ea45
First work on a new module for expense report matching dolibarr
...
standard to replace current one.
2015-02-14 18:39:45 +01:00
Laurent Destailleur
d5ec19ef83
Enhance help when running cron script from command line
2015-02-11 13:21:12 +01:00
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
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
phf
65a3c75b04
[CORE] ajout des conditions dans la librairie pour le module (#new_ask_price).
2015-02-09 11:57:30 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +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
3bdf8864a9
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
2015-02-07 04:24:31 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
ba5d355eb3
Fix bad property
2015-02-07 02:14:45 +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
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
21c78cc392
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-02 21:45:31 +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
phf
38551dd468
[CORE] retrait de liens ou champs inutile (#new_ask_price).
2015-02-02 16:17:07 +01:00
Laurent Destailleur
7fbf76ee2a
Fix phpcs
2015-02-02 15:43:22 +01:00
Laurent Destailleur
7809013b96
Message is more clear.
2015-02-02 13:33:16 +01:00
Laurent Destailleur
3f042fb558
New: Introduce option PROJECT_HIDE_TASKS for people using project only
...
as transversal analytic key and not to manage tasks.
2015-02-02 13:27:55 +01:00
Laurent Destailleur
ece70dbd2c
Merge pull request #2293 from frederic34/patch-4
...
Error message is ErrorCounterMustHaveMoreThan3Digits
2015-01-31 19:44:09 +01:00
Laurent Destailleur
c19ff003ea
Merge pull request #2292 from FHenry/develop_contract_line_extrafileds
...
NEW: contract lines extrafileds
2015-01-31 19:43:37 +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
963b9e8583
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 19:37:25 +01:00
Laurent Destailleur
9188be57ce
Select2 component creates problem of sizing with jmobile.
2015-01-31 19:25:26 +01:00
Laurent Destailleur
2788a352cf
Missing lang loading
2015-01-31 19:00:00 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
