Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Laurent Destailleur
db2eb79f34 Merge pull request #517 from atm-maxime/develop 
Fix : on supplier bill validation, question about stock was asking for s...
 2012-12-05 07:14:05 -08:00
Maxime Kohlhaas
64f5d59ddf Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase 2012-12-05 15:42:59 +01:00
Regis Houssin
136f454111 Merge pull request #516 from atm-maxime/develop 
Trans : counter to 0 every month translations
 2012-12-05 06:02:18 -08:00
Maxime Kohlhaas
2824278414 Trans : counter to 0 every month translations 2012-12-05 14:56:29 +01:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop 
New : option to reset numbering to 0 every month using @99 in the mask
 2012-12-05 04:19:16 -08:00
Regis Houssin
a4f0b7f0df Fix: avoid error with external modules 2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Regis Houssin
644a05f6dc Merge pull request #457 from atm-maxime/mko559 
Task # 559 : price by quantity
 2012-12-05 00:15:27 -08:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-05 09:10:55 +01:00
jfefe
9a8f81c740 Remove deprecated fields 
fix : data is an array, not an object
 2012-12-05 06:42:05 +01:00
jfefe
8ae10ef9f0 New webservice methods for contact : 
- new method to get contact info
- new method to create a contact
- new method to get a list of contact for a thirdparty
 2012-12-05 03:47:25 +01:00
jfefe
771634c66b Add contact info when get an user by webservice 2012-12-05 02:11:11 +01:00
Laurent Destailleur
bee97a6b3b Restore another lost commit. 
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
 2012-12-05 00:47:20 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Regis Houssin
9079c1fb3b Fix: phpunit error 2012-12-03 09:58:18 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
518b169a89 Increase field size (some system need to store an url here) 2012-12-02 19:41:49 +01:00
Laurent Destailleur
7b824665a5 Revert "Increase field size (some system need to store an url here)" 
This reverts commit 7ade37831e.
 2012-12-02 19:41:06 +01:00
Laurent Destailleur
7ade37831e Increase field size (some system need to store an url here) 2012-12-02 19:33:39 +01:00
Laurent Destailleur
86e08e87d5 Fix: date format 2012-12-02 18:21:26 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6 Qual: More complete error management into delete methods 2012-12-02 13:51:33 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
f0e75bf11a dont use ES translation for labels 2012-12-02 10:52:04 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
simnandez
3ab0b26d00 Trad: Update ca_ES and es_ES profid of countries 2012-12-01 15:47:52 +01:00
simnandez
c365dbc679 New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:39 +01:00
simnandez
4f2f56fced New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:33 +01:00
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
simnandez
d14308e07d Trad: Add ca_ES and es_ES missing translations 2012-12-01 15:47:22 +01:00
simnandez
af304638c8 Fix: Add to areas not working if we navigate with shownavref 2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
69fa1e9d10 Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY 2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00