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

43078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
49ea174d06 Added to the COPYRIGHT file too 2013-12-16 22:59:17 +01:00
Marcos García
9c6df4faf4 Corrected Copyright info for PR #1350 2013-12-16 22:56:59 +01:00
Laurent Destailleur
b37aec2027 Fix: bad include 2013-12-16 14:43:16 +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
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
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
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
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
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