Raphaël Doursenaud
f91e2ec7b2
Database: factorized begin()
2014-03-15 06:17:12 +01:00
Raphaël Doursenaud
739a566156
Database: factorized lasterrno()
2014-03-15 06:07:46 +01:00
Raphaël Doursenaud
0ab6fcaaca
Database: factorized idate()
2014-03-15 06:04:16 +01:00
Raphaël Doursenaud
64fbefdb7c
Database: factorized ifsql()
2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94
Database: factorized jdate()
2014-03-15 05:54:51 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
Maxime Kohlhaas
3131b92988
Fix bug 1293 : numbering failed
2014-03-14 23:18:46 +01:00
philippe grand
f9c48be2a9
fix : display specimen
2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b
Move skype module from experimental to stable.
2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Laurent Destailleur
561a1a1aac
Fix: Miscellaneous problems on task tabs (withproject parameter lost and
...
download fails).
2014-03-14 02:07:54 +01:00
Laurent Destailleur
f1b05dd3c2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6
New: Add manager name (ceo, director, president...) into main company
...
information page.
2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834
Merge pull request #1458 from KreizIT/dluo_step4
...
Dluo step4
2014-03-13 11:57:06 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
ded5d47afc
Fix: multilangs array was not loaded.
2014-03-12 01:21:18 +01:00
Laurent Destailleur
241ae7a4d1
Fix: Miscellaneous bugs on tasks management
...
Conflicts:
htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
2740886711
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-11 20:38:57 +01:00
Laurent Destailleur
afca98323b
Fix: Miscellaneous bugs on tasks management
2014-03-11 20:38:29 +01:00
Laurent Destailleur
5ee17a2f14
Merge pull request #1460 from atm-gauthier/3.5
...
error on ajax_constantonoff function
2014-03-11 11:53:44 +01:00
aspangaro
d97f9e50cd
Merge branch 'upstream/develop'
2014-03-11 10:40:22 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
Marcos García de La Fuente
20262a0164
Fix bug #1295 : Error when creating an agenda extrafield with a number as reference
2014-03-10 23:58:16 +01:00
Gauthier
92e8f54e9a
error on ajax_constantonoff function
2014-03-10 10:53:20 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/main.inc.php
2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f
Fix: Compatibility with v4 of ckeditor (for debian)
2014-03-08 14:06:01 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
aspangaro
db0a45d78f
Merge branch 'upstream/develop'
2014-03-08 04:54:24 +01:00
Laurent Destailleur
0a2a635755
Fix: td balance.
...
Fix: New price was not used when editing a line when margin module was
on.
2014-03-07 11:58:30 +01:00
KreizIT
a0f1a60780
Change on shipment for batch product
2014-03-07 11:35:16 +01:00
Laurent Destailleur
32c81588b0
Fix: doxygen
2014-03-07 10:54:57 +01:00
aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
15aebfb7a3
Merge pull request #1455 from marcosgdf/bug-loadban
...
Corrected bug when creating document from ODT template
2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844
Merge pull request #1454 from marcosgdf/locale-line-odt-tags
...
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Marcos García de La Fuente
ca0eb7919e
Corrected call to non-existing function
2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7
Missing copyright info
2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3
Corrected array indentation
2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78
Fix: infinite loop in function num_public_holiday
2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f
Fix: Number of day calculation. Add PHPUnit case.
2014-03-05 20:52:27 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
Laurent Destailleur
16a074a69b
Use better module id number
2014-03-05 12:25:31 +01:00
Grand Philippe
e32d31f76d
fix english misspelling
2014-03-05 09:58:52 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45
Merge pull request #1449 from KreizIT/dluo_step2
...
Dluo step2
2014-03-05 00:08:58 +01:00
Laurent Destailleur
c5e639041e
More doc comment
2014-03-04 23:56:35 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00