Laurent Destailleur
e0d2c43086
fix phpcs
2015-04-24 01:15:29 +02:00
Raphaël Doursenaud
7281ea21e6
Qual: moved mobiledetect external library
...
External libraries resides in the include directory
2015-04-23 20:30:33 +02:00
Laurent Destailleur
4f3fe82e93
NEW Add filter on task ref and task label into list of tasks
2015-04-23 15:22:50 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
e6c5b234fc
Remove debug trace
2015-04-18 03:54:33 +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
bf254baa02
Fix doliforge bug 1707
2015-04-15 18:50:41 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +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
Laurent Destailleur
493392d89f
Remove warnings
2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452
Fix warning
2015-04-06 19:31:25 +02:00
Laurent Destailleur
3d161deb17
Fix more robust function
2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0
Status and amount of object should always be visible.
2015-04-06 16:13:23 +02:00
Laurent Destailleur
2ec5595277
NEW Can install an external module from admin pages, if web server has
...
permission for and if setup is ok for.
2015-04-04 00:19:03 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
c71efc8f2e
Avoid pb with scrutinizer
2015-03-31 16:59:40 +02:00
Laurent Destailleur
42c2c81e28
Fix detection of html was wrong with img
2015-03-26 12:05:52 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
1a1959b52c
Fix: Solve conflict with imgup and imgdown class use for sort fields and
...
to drag and drop lines.
2015-03-22 21:18:25 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +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
f44d91e153
NEW: The notification module accept keyword __SUPERVISOR__ to send
...
notification to supervisor of user.
2015-03-19 11:47:30 +01:00
Laurent Destailleur
a73ff524e5
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2015-03-17 00:38:40 +01:00
Scrutinizer Auto-Fixer
b693ed3f51
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-16 23:21:17 +00:00
Laurent Destailleur
141fa56d67
Fixed bad parameter
2015-03-17 00:11:04 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +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
b564b754fc
Doxygen
2015-03-10 14:09:29 +01:00
Laurent Destailleur
12be50d4ba
Doxygen
2015-03-10 13:50:05 +01:00
Laurent Destailleur
35dfaf4dd1
Natural search on numeric works also with several space after operator
2015-03-10 10:14:24 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
dd3f569ede
NEW: Enhance the natural_search function so we can use it to search
...
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
2015-03-06 20:34:00 +01:00
Marcos García de La Fuente
0170d409d3
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2015-03-04 10:16:25 +01:00
Laurent Destailleur
52425648bf
NEW: When using transfer or correct stock from warehouse, after
...
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-04 01:14:27 +01:00
Laurent Destailleur
35733c4c08
More comments
2015-03-03 17:47:17 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Marcos García de La Fuente
e6c8cac381
Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit
2015-03-02 01:16:35 +01:00
Laurent Destailleur
0774669331
Update comment
2015-03-02 00:37:47 +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
60e2524fc2
Merge remote-tracking branch 'upstream/develop' into better-practice
...
Conflicts:
htdocs/core/lib/functions.lib.php
test/phpunit/FunctionsLibTest.php
2015-02-28 14:39:14 +01:00
Marcos García de La Fuente
f117b65a17
Removed silent operator for PHP 4 in function dol_html_entity_decode
2015-02-25 23:01:07 +01:00
Marcos García de La Fuente
f2fededd2c
Drop usage of deprecated dol_htmlentities function
2015-02-25 22:48:45 +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
Marcos García de La Fuente
40a5c15616
Improved getBrowserInfo documentation
2015-02-25 16:45:14 +01:00
Marcos García de La Fuente
f598963d6b
Fixed regression
2015-02-25 16:41:51 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
7e07638fba
Little refactor
2015-02-23 10:51:43 +01:00
Marcos García de La Fuente
71b98ee82b
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
702c19dab3
Refactored function getBrowserInfo
2015-02-22 13:17:57 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb
Better practice in getBrowserInfo
2015-02-22 12:35:51 +01:00
Laurent Destailleur
6d1324b463
Work on expense report module
2015-02-21 16:15:54 +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
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
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
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
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
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
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
3bdf8864a9
New: Add option MAXTABS_IN_CARD to limit number of visible tabs.
2015-02-07 04:24:31 +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
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
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
1e72d49858
Merge pull request #2286 from accett/patch-1
...
New: Introduce num to text function and use sign before amout for mexico currency
2015-01-31 15:55:16 +01:00
Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +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
accett
62ae75b3bf
Update for Mexico Users
...
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
2015-01-26 14:38:02 -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
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
9876b30387
Need more info to find bugs
2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
e20c1decdf
Fixed: object instead of soc and vis versa.
2015-01-15 03:51:47 +01:00
Laurent Destailleur
68441a563a
Fixed: Avoid space into address string
2015-01-14 19:17:58 +01:00
Laurent Destailleur
a2c9d5bd4a
Fixed balance of td introduced by MAX_TAB option.
2015-01-14 19:10:21 +01:00
Laurent Destailleur
e10b5637d4
Fixed: Avoid spaces into address string
2015-01-14 18:54:56 +01:00
