Laurent Destailleur
54baf325e1
Merge pull request #1353 from atm-geoffrey/develop
...
add extrafields support in supplier orders
2013-12-18 08:52:20 -08:00
Geoffrey
1942b4a476
add extrafields support in supplier orders. managed in configuration but not in view mode
2013-12-17 16:15:48 +01:00
Laurent Destailleur
b37aec2027
Fix: bad include
2013-12-16 14:43:16 +01:00
Laurent Destailleur
d01e83029e
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 14:21:17 +01:00
Laurent Destailleur
7127f5fc21
fix: doxygen
2013-12-16 14:16:01 +01:00
Laurent Destailleur
6328aec65d
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 14:12:11 +01:00
Laurent Destailleur
c1ee59eef9
Qual: Add phpunit tests for margin lib
2013-12-16 14:10:52 +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
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +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
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
b03d1d9575
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-12-15 03:23:28 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
20984ea451
Start to work on a basic print sticker tool
2013-12-15 03:20:46 +01:00
Laurent Destailleur
77d670ada2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-15 02:02:51 +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
692b2985ef
Prepare 3.6
2013-12-15 00:05:04 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +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
6033b7dbba
Merge pull request #1347 from fappels/develop
...
fix sql error on create commande
2013-12-13 18:53:57 -08:00
Laurent Destailleur
2519f09133
Merge pull request #1345 from marcosgdf/translation-dev
...
Corrected translation
2013-12-13 18:52:48 -08:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
ad0d79a831
Merge pull request #1346 from marcosgdf/translation
...
Corrected translation
2013-12-13 18:51:04 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
7af5cc18bc
Sync from transifex
2013-12-14 03:09:51 +01:00
Laurent Destailleur
684be44846
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 02:57:43 +01:00
Laurent Destailleur
4d84fc46a4
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/makepack-dolibarr.pl
2013-12-14 02:56:23 +01:00
Laurent Destailleur
1f3f6cc7b8
Fix: Avoid to have external package into standard distribution
2013-12-14 02:55:12 +01:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Laurent Destailleur
873f4b902d
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:31:06 +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
9af2ac1afa
Sync from transifex
2013-12-14 01:05:33 +01:00
Laurent Destailleur
5cd6c05384
Fix: Uniformize amounts
2013-12-14 00:31:29 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +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
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
