lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,304 Commits 43 Branches 150 Tags 886 MiB
3.8
Commit Graph

2298 Commits

Author SHA1 Message Date
Laurent Destailleur
b8736b0a6f Merge pull request #2457 from accett/patch-5 
Update functionsnumtoword.lib.php
 2015-04-17 22:42:19 +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
8511f1f7ef Fix the data-role parameter 2015-04-15 18:14:26 +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
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
Laurent Destailleur
503a4ff7a0 Enhance filtering for bank transaction and timesheet. 2015-04-09 20:40:49 +02:00
Laurent Destailleur
3ee2790737 Always sho project info when opening task card 2015-04-09 16:26:21 +02:00
braito4
914b324a67 minor bug drag and drop total line in tasks list 2015-04-09 10:37:54 +02:00
Laurent Destailleur
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Frédéric FRANCE
0dc7bc0ddb Add badge 2015-04-07 12:54:10 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a Fix deprecated code 2015-04-07 02:48:19 +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
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00: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
106a393054 NEW Add function dolCopyDir to copy directory with recursive content. 2015-04-03 23:42:56 +02:00
Laurent Destailleur
afecab3f39 Better error management for dol_uncompress 2015-04-03 18:42:07 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
d8bec2fb59 Merge pull request #2507 from frederic34/doc4contact 
Add document tab for contact
 2015-04-02 11:41:35 +02:00
Laurent Destailleur
051f3474c4 Merge pull request #2512 from frederic34/patch-9 
Add badge
 2015-04-02 11:25:06 +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
Frédéric FRANCE
2a34ec9db1 Add badge 2015-03-31 16:26:32 +02:00
frederic34
fe6227e93f Typo 2015-03-31 08:45:36 +02:00
frederic34
bab04258e0 Add document tab for contact 2015-03-30 18:15:29 +02:00
Marcos García de La Fuente
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00
Frédéric FRANCE
bcd7516e25 Fix for donation.lib.php 2015-03-29 18:22:45 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
aspangaro
a92f68a5ed Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-29 09:25:06 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
frederic34
be1595a187 Add tab for notes 2015-03-28 17:42:33 +01:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
679391d337 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-25 20:59:48 +01:00
Laurent Destailleur
cc2d86bd58 Status of project was not visible on thirdparty card 2015-03-25 14:31:04 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
Laurent Destailleur
efe9c21b81 Merge pull request #2382 from aspangaro/develop-loan 
NEW: Module loans
 2015-03-23 23:28:57 +01:00
aspangaro
be0ab4c9b4 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-23 06:58:25 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
5c36bb94f2 Work on theme material design 2015-03-22 22:29:52 +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
aspangaro
ad0f1aae6b Move loan in htdocs 2015-03-22 20:19:22 +01:00
Laurent Destailleur
49824a0e56 Method colorStringToArray can accept the # 
Method monthArray can return short label of month
 2015-03-22 18:17:25 +01:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +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
aspangaro
9264482e25 Update works 2015-03-22 08:20:19 +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
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
b0b88be81f Sync transifex 2015-03-18 15:27:27 +01:00
Laurent Destailleur
840b047468 Work on new timesheet input pages. 2015-03-18 11:20:08 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +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
AcceTT Soluciones Computacionales
60d334f646 Update functionsnumtoword.lib.php 
Now the function convert since -1000000000000 to 1000000000000.
Correct some bugs.
Change $lang-> default to $langs
 2015-03-15 17:47:51 -06:00
Marcos García de La Fuente
b822a1e3ad Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-15 18:20:17 +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
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +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
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 02:10:01 +00:00
Laurent Destailleur
97f36825df Work on new timesheet page 2015-03-05 21:47:50 +01:00
aspangaro
11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-05 20:24:53 +01:00
Laurent Destailleur
d7ab3f112c NEW: Show difference between timespent by everybody and time spent by 
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
 2015-03-05 13:48:57 +01:00
Laurent Destailleur
e431e24889 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-05 11:14:01 +01:00
Laurent Destailleur
c36f92396b Add navigation into the new timesheet week page. 
Fix bad merge
 2015-03-05 11:13:44 +01:00
Laurent Destailleur
f0f0e7bfbb Merge pull request #2415 from aspangaro/develop-patch16 
NEW: Add bank account owner in invoice/proposal/orders footer
 2015-03-04 23:07:46 +01:00
Laurent Destailleur
40adbe5a72 Merge pull request #2420 from aspangaro/develop-patch17 
NEW: [T1848] Merge bank card & account card
 2015-03-04 21:09:28 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +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
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
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +01:00
Laurent Destailleur
fddbca50b1 Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of 
tracking id into email.
 2015-03-03 18:33:53 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
aspangaro
fafebf5b2a NEW: [T1758] Merge bank card & account card 2015-03-02 22:44:11 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +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
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +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
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
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice 
Better practice in getBrowserInfo
 2015-03-02 00:28:40 +01:00
aspangaro
e24a317f0f NEW: Add bank account owner in invoice/proposal/orders footer 2015-03-01 21:31:03 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e Fix: we must use status to find label of status 2015-03-01 16:24:02 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Marcos García de La Fuente
c925b09946 CodeSniffer fix 2015-02-28 19:26:41 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +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
2ba795fcbc NEW: [ task #851 ] Add a new field: Commercial name 2015-02-28 14:30:06 +01:00
Laurent Destailleur
a87c867c28 Translation 2015-02-26 16:02:03 +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
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +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
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
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +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
94751ba57b Merge pull request #2361 from aspangaro/3.7-patch3 
[T1728] Deactivate RIB suggest in proposals/invoices/orders
 2015-02-19 09:41:39 +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
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
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
ce8ad39a8e Remove test code and restore prod code. 2015-01-31 13:00:51 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +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
phf
2f8ceea587 [CORE] renomage de variables pour le module + modification de traductions (#new_ask_price). 2015-01-29 12:12:22 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01:00
phf
a98ce01807 [CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price). 2015-01-28 17:27:26 +01:00
phf
903f739449 [CORE] avancement du mercredi matin (#new_ask_price). 2015-01-28 10:33:15 +01:00
Frédéric FRANCE
a560b582f5 Update functions2.lib.php 2015-01-28 00:02:57 +01:00
phf
aaacca9b13 [CORE] première partie des grosses modifications (#new_ask_price). 2015-01-27 16:53:27 +01:00
Florian HENRY
a510a1ef5c First step add contract lines extrafields 2015-01-27 12:53:02 +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
0647c49067 Merge pull request #2274 from aschio/develop 
New: Added Extrafields for Supplier invoice lines and Supplier order lines
 2015-01-25 19:21:03 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
a4990a58b1 The badge was missing for shipment 2015-01-23 18:39:40 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +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
cla
6dfd5b1fac Added extrafields features for Supplier Invoice Line and Supplier Order Line 2015-01-22 14:15:34 +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
f96fdc7d0a Regression solved 2015-01-18 21:04:39 +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
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +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
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +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
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
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
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
Laurent Destailleur
13132ef2ed Better organisation of entries into security setup area 2015-01-12 13:20:27 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-09 22:55:17 +01:00
fentman
742ec954cd Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-08 11:21:25 +11:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00
Laurent Destailleur
baa247ea86 Fixed: doxygen 2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02 Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Maxime Kohlhaas
e7ebb78ffd in PDF, no line jump after doc linked ref. Fix bug 1605. 2014-12-26 11:09:46 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +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
Juanjo Menent
65eef3587a Merge pull request #2166 from defrance69/patch-36 
Update functions.lib.php
 2014-12-24 15:38:48 +01:00
Marcos García de La Fuente
294753dc47 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:32:25 +01:00
Marcos García de La Fuente
b68276637b Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some 
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-12-24 14:31:17 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
BENKE Charles
b45bd06475 Update functions.lib.php 
Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
 2014-12-22 12:26:04 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
1dc2bbb0f1 Fixed: Var no declared 2014-12-22 03:01:31 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +01:00
Laurent Destailleur
74d5e11831 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-20 15:42:30 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
cea500ef80 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
 2014-12-20 13:06:08 +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
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
d9aba405dd Fix: utf must be default value. 2014-12-18 10:09:47 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
67cf3cb99b Fixed: BIC/SWIFT and IBAN must be at same level 2014-12-11 10:13:44 +01:00
Frédéric FRANCE
66f634f217 Update functions.lib.php 2014-12-09 20:47:54 +01:00
Frédéric FRANCE
590618eb38 Update functions.lib.php 2014-12-09 20:17:13 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark 
param that are deprecated, convertion of value to get correct
format in all situation)
 2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22 Fixed: Several fix in color management (function at wrong place, mark 
param that are deprecated, convertion of value to get correct
format in all situation)
 2014-12-08 19:05:22 +01:00
Laurent Destailleur
c3734b1a88 Merge pull request #2103 from grandoc/develop 
add default payment mode select
 2014-12-08 00:03:05 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7 Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:03:48 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:00:49 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
76bd7dd512 Fixed: A lot of fixed on project views (info on project area). Also add 
a limit to avoid problem with very large database.
 2014-12-04 11:03:48 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Philippe GRAND
cef835cd2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-12-01 11:27:46 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place 
Fixed: Must use style css span badge for number of files
 2014-12-01 00:53:15 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Philippe GRAND
217cacbc29 To avoid over wrighting lines 2014-11-27 17:26:06 +01:00
Frédéric FRANCE
2ee55a39fd Update ecm.lib.php 2014-11-26 18:35:16 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs 
Show sender Country on PDF docs when sender Country != receiver Country
 2014-11-25 14:26:45 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
 2014-11-16 15:46:08 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
539a201d3e Fix: doxygen 2014-11-15 18:30:37 +01:00
Laurent Destailleur
741adc79b2 Fix: Bugs reported by scrutinizer 2014-11-15 17:05:43 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
6bac744709 Fix: Missing event management into select when combo not selected 2014-11-13 16:46:40 +01:00
Florian HENRY
c0a3606a59 Fix problem on task creation with chrome for french browser. 2014-11-12 22:53:23 +01:00
Laurent Destailleur
d164b2d0e1 Fix: Showing capital 2014-11-12 10:37:39 +01:00
Florian HENRY
e9f754395d Start bank extrafields 2014-11-10 13:09:58 +01:00
aspangaro
9c3fa5a9eb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-09 07:26:14 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
aspangaro
840dfd780d Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-07 21:28:39 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
Laurent Destailleur
5c2862dae3 Merge pull request #1976 from frederic34/patch-2 
Add a little delay in ajax_autocompleter
 2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b Merge pull request #1993 from aspangaro/3.6-patch 
GPLv3
 2014-11-04 17:40:38 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
a4a01de8a1 Fix: Missing label 2014-11-03 18:00:11 +01:00
aspangaro
29c6797835 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 06:15:45 +01:00
Laurent Destailleur
ddf737daed Removed deprecated page and option. 2014-11-03 01:07:07 +01:00
aspangaro
a1980a1917 Correct travis error - Not me ! 2014-11-02 22:04:01 +01:00
Laurent Destailleur
627f5694f0 Fix: Infinite loop 2014-11-02 21:19:00 +01:00
Laurent Destailleur
84653f70be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-02 21:16:56 +01:00
Laurent Destailleur
5a18904bb4 Fix: Infinite loop 2014-11-02 21:16:31 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
Laurent Destailleur
167ec6917a Can add prefix into generated filename. This will save time for script 
to build kit of files for book keeper.
 2014-11-01 20:15:51 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Frédéric FRANCE
08e958152c Update ajax.lib.php 2014-10-30 18:45:47 +01:00
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4 
On/Off for Object (do not restrict to product)
 2014-10-30 18:21:50 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
0fc1c85b34 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 00:42:52 +02:00
Frédéric FRANCE
b2a9b48a78 Update ajax.lib.php 
Add a delay before making request, may avoid multiple request to server when typing search request
 2014-10-24 10:40:48 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Frédéric FRANCE
a1bedcc263 Update ajax.lib.php 2014-10-18 22:46:13 +02:00
Frédéric FRANCE
eefb211be7 Update ajax.lib.php 2014-10-18 18:48:13 +02:00
Frédéric FRANCE
8bb0ce0f7f Update ajax.lib.php 2014-10-18 17:17:41 +02:00
Frédéric FRANCE
dd5ea670e2 Update ajax.lib.php 2014-10-18 17:11:02 +02:00
Frédéric FRANCE
2107a61bbe Update ajax.lib.php 
For use in a list of object
 2014-10-18 16:32:32 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Frédéric FRANCE
96aee6eed4 Update ajax.lib.php 2014-10-18 15:48:59 +02:00
Laurent Destailleur
97f98d7e16 Merge pull request #1955 from frederic34/patch-2 
Ajax On/Off for product tosell and tobuy
 2014-10-18 14:18:14 +02:00
Laurent Destailleur
fb76fc94b5 Merge pull request #1963 from defrance69/patch-24 
Update functions2.lib.php
 2014-10-18 14:11:25 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
BENKE Charles
8095bbf809 Update functions2.lib.php 2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa Fix: avoid warning 2014-10-17 16:23:32 +02:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
BENKE Charles
589a3fdf95 Update functions2.lib.php 2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d Update functions2.lib.php 
disable entity filter fields for module who not use multicompany fields
 2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00