Laurent Destailleur
45b3a02e8b
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-10 01:37:58 +01:00
Laurent Destailleur
2c310e26a6
Fix: Missing lang file
2014-01-10 01:37:41 +01:00
Laurent Destailleur
374be1854e
Fix: Bad url
2014-01-09 23:12:28 +01:00
Laurent Destailleur
eae92695d6
Fix: Warning into bank conciliation feature.
2014-01-09 18:47:33 +01:00
Maxime Kohlhaas
364085bd20
Fix : wrong var used in bank account class
2014-01-09 18:42:35 +01:00
Laurent Destailleur
511a44a7e6
Merge pull request #1368 from csalvador/webservices-debug
...
fixed wrong thumbnails directory
2014-01-09 06:28:53 -08:00
Laurent Destailleur
2b4f0bd4b1
Fix: Add a limit into list to avoid browser to hang when database is too
...
large.
2014-01-09 14:28:32 +01:00
Cédric Salvador
e959568a1d
Added details to the contact created by create_individual
2014-01-09 09:10:50 +01:00
Laurent Destailleur
63ecb859d6
Fix: Missing alias befofe field into sql request and removed bad join on
...
table making some record to disappear.
2014-01-08 20:50:04 +01:00
Laurent Destailleur
c0c555b78f
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-08 15:16:56 +01:00
Cédric Salvador
68e42bc24e
fixed wrong thumbnails directory
2014-01-07 17:26:12 +01:00
Laurent Destailleur
6e5f3b8bdd
Fix: entity into public pages not set at correct place
2014-01-07 16:29:25 +01:00
Laurent Destailleur
1df18f1e93
Fix: Function GETPOST not found
2014-01-07 16:11:08 +01:00
Laurent Destailleur
4d379e572a
Fix: Bugs into permissions for module category
2014-01-07 15:35:26 +01:00
simnandez
b8550bb985
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:56 +01:00
simnandez
d4db5916f0
Fix: Bad get of localtaxes into contracts add lines
2014-01-07 12:16:16 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Laurent Destailleur
ab7a17fe73
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-06 19:12:06 +01:00
Laurent Destailleur
0e3184c436
Fix: W3C.
...
Fix: Permission on a button.
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/soc.php
Fix: Some menu entry not visible.
2014-01-06 17:17:57 +01:00
Laurent Destailleur
7fd34e5ff6
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
2014-01-06 12:42:50 +01:00
Laurent Destailleur
2d8214a940
Fix: The delete button into ecm module does not work when ajax disabled.
2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa
Fix: W3C. Input fields can be between a table and tr tag.
2014-01-05 18:30:35 +01:00
Laurent Destailleur
667908baf8
Fix: Missing lang loading
2014-01-05 16:37:33 +01:00
Laurent Destailleur
283297294b
Fix: Missing definition of status labels
2014-01-05 16:19:25 +01:00
Laurent Destailleur
48973c6d02
Fix: Some SQL requests were not finished into new tab "consumption".
2014-01-05 16:00:45 +01:00
Laurent Destailleur
9a6f22a86e
Fix: W3C no form into table.
...
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
67220a15ca
Fix: Bad translation key
2014-01-05 14:13:40 +01:00
Laurent Destailleur
5a7fe6b4a7
Fix: Change to make debian package ok despite removal of ckeditor
...
package.
2014-01-05 01:17:38 +01:00
Laurent Destailleur
d2d0d715a9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/install/mysql/data/llx_c_tva.sql
2014-01-04 19:02:56 +01:00
Laurent Destailleur
f1120b8749
Merge pull request #1363 from atm-alexis/3.4
...
New standard VAT rate for France on january, 1st, 2014
2014-01-04 09:59:59 -08:00
Laurent Destailleur
2ee5076970
Problem of key of language into auguria menu
2014-01-04 18:57:57 +01:00
Laurent Destailleur
ee1e7471ff
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-04 16:17:47 +01:00
Laurent Destailleur
f6cda9deb6
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:40:13 +01:00
Laurent Destailleur
f0503dfaa9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/compta/stats/cabyprodserv.php
htdocs/compta/stats/casoc.php
2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22
Fix: Bad SQL request when using filter on category.
2014-01-03 18:16:21 +01:00
Alexis Algoud
68893b205c
New standard VAT rate for France on january, 1st, 2014
2014-01-03 09:58:01 +01:00
Laurent Destailleur
601b2744e0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/debian/changelog
2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096
Fix: doxygen
2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:49:36 +01:00
Laurent Destailleur
5fd47b34b0
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:30:32 +01:00
Laurent Destailleur
0bdcda50c6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +01:00
Laurent Destailleur
f44a45feb2
Fix: Missing some languages into the transifex sync script.
...
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
0bf88ce44f
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2013-12-31 10:48:51 +01:00
Laurent Destailleur
e142bd252d
Fix: disable code making jmobile crazy.
2013-12-31 10:48:15 +01:00
Laurent Destailleur
2e0fc364bd
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb
Fix: Removed analytics tags
2013-12-30 12:35:32 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Laurent Destailleur
8248f63826
Fix: Missing translation
2013-12-27 20:31:57 +01:00
Laurent Destailleur
29ae579298
Fix: Bad link
2013-12-27 20:29:30 +01:00
Laurent Destailleur
8207b7c243
Missing translation
2013-12-27 20:27:17 +01:00
Laurent Destailleur
d07c767f25
Fix: Alignement of element into block login
2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2
Fix: Alignement of element into block login
2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2
Fix: Missing translation.
...
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
BENKE Charles
94bf105b13
Update llx_projet_task.sql
...
new field "ref" present on update sql but not on the table
2013-12-27 17:14:56 +01:00
Laurent Destailleur
3bb4de3e86
Better translation
2013-12-27 15:56:00 +01:00
simnandez
91b104aeb8
Fix: setup not saving changes
2013-12-26 11:32:13 +01:00
Laurent Destailleur
22412443fe
Fix: Overwrite bad value of limit payment date only if payment date is
...
defined.
2013-12-25 18:12:13 +01:00
Laurent Destailleur
76e4ba06a4
Fix: Calulcation of oustanding amount must not include abandonned
...
invoices.
2013-12-25 17:36:37 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191
Fix: Can import contacts not linked to any thirdparties.
2013-12-24 16:11:23 +01:00
simnandez
8c9d145759
Fix: Bad url destination into category remove
2013-12-24 13:39:58 +01:00
simnandez
d6b2f96c19
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:38:38 +01:00
Laurent Destailleur
81f1098d41
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-23 12:06:07 +01:00
Laurent Destailleur
331341bf5a
Fix: Bad picto
2013-12-23 12:05:32 +01:00
Laurent Destailleur
aad7d32f7d
Merge pull request #1354 from csalvador/webservices-debug
...
Webservices debug
2013-12-23 02:20:15 -08:00
Florian Henry
e971e4dfff
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
2013-12-23 11:05:14 +01:00
simnandez
11353786a1
Fix: Unable to make a withdrawal with two or more invocies
2013-12-23 10:46:19 +01:00
Laurent Destailleur
d9c7dc8697
Fix: Add protection to not delete a root directory when deleting a
...
company.
2013-12-21 12:04:39 +01:00
Cédric Salvador
18b163c6db
allow the webservice to create a private individual
2013-12-20 17:03:24 +01:00
Laurent Destailleur
47b1a2c082
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-12-20 13:55:10 +01:00
Laurent Destailleur
2bc579324d
Fix: Opening agenda for a specific day
...
Fix: No picto of thirdparty of contact if link is broken
2013-12-20 13:51:59 +01:00
simnandez
4d3290e4bf
Trad: Improve es_ES trans
2013-12-19 18:33:03 +01:00
simnandez
e4da8623f8
Trad: Add missing es_ES trans
2013-12-19 18:18:26 +01:00
Cédric Salvador
168412a2d6
Wrong parameters order in the function call
2013-12-19 16:06:59 +01:00
Cédric Salvador
0a0ef548ef
Solved some bugs in order creation and validation
2013-12-19 16:06:59 +01:00
Cédric Salvador
f98838616e
Do not forget the thumbs directory when returning the images paths
2013-12-19 16:06:59 +01:00
simnandez
a1e0d84e37
Fix: Lost stats filters into year selection
2013-12-19 15:43:22 +01:00
simnandez
8e247e8615
Trad: Fix missing translation
2013-12-19 12:47:39 +01:00
simnandez
2e840a3d37
Trad: Add missing trans
2013-12-19 10:41:44 +01:00
simnandez
3b3b66e612
Trad: Update es_ES translations
2013-12-19 10:29:34 +01:00
Laurent Destailleur
7e08ee9437
Merge pull request #1351 from atm-geoffrey/3.5
...
add extrafields support in supplier orders
2013-12-18 08:56:07 -08:00
Laurent Destailleur
8036151778
Merge pull request #1352 from marcosgdf/bug-1196
...
Corrected Copyright info for PR #1350
2013-12-18 08:49:51 -08:00
Laurent Destailleur
11e0fb8f7a
Fix: Missing ref field into export.
2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213
Fix: Calculation of number of linked files was not working on taxes.
2013-12-16 23:45:12 +01:00
Marcos García
9c6df4faf4
Corrected Copyright info for PR #1350
2013-12-16 22:56:59 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Laurent Destailleur
6bfc0d14b2
Merge pull request #1350 from marcosgdf/bug-1196
...
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
2013-12-16 05:26:10 -08:00
Laurent Destailleur
7127f5fc21
fix: doxygen
2013-12-16 14:16:01 +01:00
Laurent Destailleur
cfec85c2d6
Fix: Rewrite content of getMarginInfos.
...
This solve bug of rounding with total price when we need a unit price.
This solve lso bug of rounding on non decimal basis that we don't want.
Also this remove calling database when not usefull so make possible to
call this function into fetch (this remove the FIXME not into comment
so).
2013-12-16 13:24:00 +01:00
Geoffrey
dce354adc3
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-16 11:13:39 +01:00
Alexis Algoud
ba70794c1d
Add multicompany->enabled test
2013-12-16 09:45:38 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Marcos García
290b810bb8
Little refactor in product/liste.php
2013-12-15 18:49:55 +01:00
Marcos García
d65374bb02
Fixed bug #1196 : Product barcode search does not expect 13th digit on EAN13 type
...
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
2013-12-15 18:44:53 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
bba2892752
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/commande/liste.php
2013-12-15 02:02:24 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
0e25939373
Fix: price function not correctly used
2013-12-14 17:40:23 +01:00
Laurent Destailleur
db9ef992eb
Fix: Clean var
2013-12-14 17:25:57 +01:00
Laurent Destailleur
648bf73bac
Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date
...
should be checked
Conflicts:
htdocs/commande/liste.php
2013-12-14 15:49:08 +01:00
Laurent Destailleur
ed40e6d9b0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/langs/en_US/bills.lang
2013-12-14 15:44:10 +01:00
Laurent Destailleur
dc1ccbfae8
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9
Fix: [ bug #1177 ] Error on create domiciliation
2013-12-14 15:35:13 +01:00
Laurent Destailleur
8cd538cce4
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 15:26:58 +01:00
Laurent Destailleur
7ecb313798
Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers
2013-12-14 15:26:22 +01:00
Laurent Destailleur
6cc20cb731
Fix: Filter on third parties were wrong for external users.
2013-12-14 15:21:15 +01:00
Laurent Destailleur
5a4b5dcc26
Fix: Missing condition
2013-12-14 14:21:27 +01:00
Laurent Destailleur
ad0d79a831
Merge pull request #1346 from marcosgdf/translation
...
Corrected translation
2013-12-13 18:51:04 -08:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +01:00
Laurent Destailleur
5cd6c05384
Fix: Uniformize amounts
2013-12-14 00:31:29 +01:00
Laurent Destailleur
c51fa7048c
Fix: text must not be encoded when provided as data of a function.
2013-12-13 21:12:18 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4
In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted.
...
Ex in agefodd module:
$obj_link=new Propal($db);
$obj_link->id=$agf->propalid;
$resultdel=$obj_link->delete($user);
To prevent misuse of the function, the reference is not considered given
2013-12-11 15:14:29 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Laurent Destailleur
75703a03cc
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93
Fix: We should not load stock details at each product fetch
2013-12-10 19:41:45 +01:00
Laurent Destailleur
ad420bbf42
Mark file as bugged (seriously)
2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826
Fix: sql where on an int must not contains '
2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f
Fix: Missing db transaction
2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Marcos García de La Fuente
d226abcdfc
Corrected translation
2013-12-10 14:30:40 +01:00
Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +01:00
Laurent Destailleur
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +01:00
Laurent Destailleur
705192215a
Merge pull request #1341 from marcosgdf/bug-1182
...
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 16:49:50 -08:00
Laurent Destailleur
565fb615bc
Update gitignore
2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24
Fix: Missing translation
2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01:00
Laurent Destailleur
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b
Update ignore files
2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629
Fix: Mass update of vat must work also for supplier prices
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-12-07 12:06:41 +01:00