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

34379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in 
order to use this value with jquery
 2012-12-07 13:48:11 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when 
amount value = o (letter) instead 0 (number)
 2012-12-07 10:47:36 +01:00
Laurent Destailleur
41302b7b75 Merge pull request #521 from grandoc/develop 
fix : typo
 2012-12-06 11:15:10 -08:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Grand Philippe
c6a3add952 fix : typo 2012-12-06 17:09:12 +01:00
Regis Houssin
50206bbd73 Fix: avoid errors 2012-12-06 10:43:27 +01:00
Laurent Destailleur
084bd3a4a8 Merge pull request #520 from cbattarel/develop 
update changeLog with latest new features
 2012-12-05 15:27:59 -08:00
Christophe Battarel
4560c2e9d7 update changeLog with latest new functionnalities 2012-12-05 23:20:34 +01:00
Laurent Destailleur
f68a3e4056 Update demo file with last structure 2012-12-05 21:59:16 +01:00
Laurent Destailleur
2cfd8fbd64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-05 21:32:49 +01:00
Laurent Destailleur
7250592d0c Code comments 2012-12-05 21:32:18 +01:00
Laurent Destailleur
463f99a6b8 Merge pull request #519 from cbattarel/develop 
add search box to find product by supplier ref
 2012-12-05 11:37:13 -08:00
Christophe Battarel
bbc470b3ae add search box to find product by supplier ref 2012-12-05 19:56:23 +01:00
Christophe Battarel
88db3da002 allowing product search by supplier ref 2012-12-05 19:51:25 +01:00
Laurent Destailleur
fc031ede73 Merge pull request #518 from cbattarel/develop 
create intervention from ordered services
 2012-12-05 10:21:02 -08:00
Christophe Battarel
b68153ce9a add button in order to create intervention from services ordered 2012-12-05 19:07:07 +01:00
Christophe Battarel
0c064c777a add ability to fichinter to be created from an order (services only) 2012-12-05 19:01:18 +01:00
Christophe Battarel
2a4261db28 add linked object storage in fichinter 2012-12-05 18:48:02 +01:00
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
Regis Houssin
f1b4d6036d Merge pull request #514 from jfefe/webservices 
Webservice contact
 2012-12-05 00:14:19 -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
Regis Houssin
f6bfd97734 Merge pull request #513 from jfefe/webservices 
Webservices  : contact
 2012-12-04 19:14:43 -08: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
jfefe
002ccaf81d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2012-12-05 01:12:40 +01:00
Laurent Destailleur
2a49c201b1 Merge pull request #512 from jfefe/webservices 
Generate Create method in script to build webservice from class
 2012-12-04 16:12:23 -08:00
jfefe
3c6c954cfc Generate Create method in script to build webservice from class 2012-12-05 01:08:42 +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
bbeab3e098 A PHPUnit test was successfull must never be removed. Creating 
such test is useless if we removed them when they report error. When an
error is reported, the PHPUnit error must be kept until the code is
fixed (regression) or until the test is fixed (if code has changed
in a not compatible way, should be rare). But test must not be
removed. The error must be reported until fixed.
 2012-12-03 20:26:27 +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
b5d4a16f1b FIXME shiittttt 2012-12-03 11:24:30 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Regis Houssin
0c142594be Fix: try invert test 2012-12-03 11:14:36 +01:00