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

39936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
098e6f4560 Added new tab types in modMyModule.class.php 2013-12-25 03:17:16 +01:00
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
simnandez
fca35cb8b0 Fix: Bad url destination into category remove 2013-12-24 13:40:54 +01:00
simnandez
bf333d4f54 Fix: Some config data are shared between suppliers orders and suppliers 
invoices
 2013-12-23 16:39:37 +01:00
simnandez
d8644ec04c Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:47:35 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Laurent Destailleur
acc4850d20 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-12-19 20:57:24 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs 
when you use the "print" view on screen.
 2013-12-19 20:57:13 +01:00
simnandez
aac21c7a3c Trad: Improve es_ES trans 2013-12-19 18:33:54 +01:00
simnandez
4d3290e4bf Trad: Improve es_ES trans 2013-12-19 18:33:03 +01:00
simnandez
bfaf6d8ac8 Trad: Add missing es_ES trans 
Conflicts:
	htdocs/langs/es_ES/companies.lang
 2013-12-19 18:20:16 +01:00
simnandez
e4da8623f8 Trad: Add missing es_ES trans 2013-12-19 18:18:26 +01:00
simnandez
03e2901070 Fix: Lost stats filters into year selection 2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37 Fix: Lost stats filters into year selection 2013-12-19 15:43:22 +01:00
simnandez
c35fc6b2d8 Trad: Fix missing translation 2013-12-19 12:48:19 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00
simnandez
42dbe88baa Trad: Add missing trans 
Conflicts:
	htdocs/langs/es_ES/main.lang
 2013-12-19 10:51:06 +01:00
simnandez
1d4cf1a255 Trad: Update es_ES translations 
Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/stocks.lang
 2013-12-19 10:48:55 +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
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
1dca56c213 Fix: Calculation of number of linked files was not working on taxes. 2013-12-16 23:45:12 +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
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
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