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

2912 Commits

Author SHA1 Message Date
Florian HENRY
b9df48d48c Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
 2014-07-11 15:53:31 +02:00
KreizIT
b8499a80ec Refactor: LINK_* trigger 2014-07-11 15:08:01 +02:00
Laurent Destailleur
728ca22183 Merge pull request #1730 from GPCsolutions/accessibility 
Accessibility
 2014-07-11 14:57:02 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +02:00
Raphaël Doursenaud
55d062784d Added labels on objectline form elements 2014-07-11 13:25:44 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
frederic34
c8e6387e52 Merge remote branch 'upstream/develop' into selectbank 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
688d58413b Merge pull request #1710 from aspangaro/develop-accounting2 
New feature :: Add fiscal year
 2014-07-07 21:28:35 +02:00
frederic34
0cb5220d4d Use english for the function name 2014-07-07 20:54:41 +02:00
frederic34
9949713d20 Some cleaning 2014-07-07 18:40:18 +02:00
KreizIT
4e08e2b5d5 Fix rollback and test errno 2014-07-07 11:32:56 +02:00
Laurent Destailleur
96ec3ad7f4 Fix: Allow percent to solve presentation pb by some pages. 2014-07-07 00:14:24 +02:00
Laurent Destailleur
4dbc1dd1c6 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-06 21:09:10 +02:00
frederic34
f29eeceb1a Select bank account for propal and order 2014-07-06 20:49:34 +02:00
aspangaro
e294fe1edd Update 2014-07-05 21:58:39 +02:00
aspangaro
7892852f44 Merge branch 'Upstream/develop' 2014-07-05 21:56:47 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Laurent Destailleur
fa82cbceb9 Qual: Removed useless function 2014-07-05 08:59:41 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Laurent Destailleur
8e2999f73f Fix: phpcs 2014-07-04 14:19:03 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
aspangaro
a2ac578712 Merge branch 'Upstream/develop' 2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85 use count() instead sizeof() 2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +02:00
aspangaro
46320071a0 Merge branch 'Upstream/develop' 2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d Update 2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94 Fix: typo 2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1 Add comments 2014-06-28 14:06:29 +02:00
Laurent Destailleur
29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into 
defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
 2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1 Using hidden constant to use the feature 
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
 2014-06-26 22:34:40 +02:00
Laurent Destailleur
a2f610ffbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop 
Conflicts:
	htdocs/product/class/product.class.php
 2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a Merge pull request #1686 from KreizIT/movetrig 
Fix [ bug #1459 ]
 2014-06-26 21:01:48 +02:00
Laurent Destailleur
2deadea40a New: Filter on event status 2014-06-26 20:24:00 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
KreizIT
92f1778c9d Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error 
Start refactoring trigger call from within object
 2014-06-25 16:51:26 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
aspangaro
56785f1149 Merge branch 'Upstream/develop' 2014-06-24 06:10:47 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
a72c3d4381 Merge branch 'develop' of github.com:atm-maxime/dolibarr into 
atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2014-06-20 17:11:12 +02:00
Laurent Destailleur
2dc3e5b104 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger (Add a protection to avoid multiple errors).
 2014-06-20 16:20:39 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Maxime Kohlhaas
dd83a52fb1 Fix : project list was showing all projects instead of company project. This wasn't matching the function comments. 2014-06-20 13:59:50 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Florian HENRY
9bb537f399 - New: If multilangue is enabled, mail (from propal, invoice, etc...) 
message is pre-defaulted in Customer language
 2014-06-18 09:59:15 +02:00
Florian HENRY
df9f153142 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-06-17 12:01:45 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
0ed2481a20 Removed unuseful errors 2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Laurent Destailleur
48cdd3c13f Fix: extra fields key. 2014-06-06 16:08:42 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
c45aace9b9 Add easy fix to solve pb of links for some modules. 2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63 Fix: Missing global 2014-06-05 22:42:49 +02:00
Florian HENRY
0de66e838c camel case 2014-05-30 12:01:26 +02:00
Laurent Destailleur
fb0f0047e7 Merge pull request #1633 from aspangaro/develop 
Typo / Missing key language / Fix limit list on mass movement stock page
 2014-05-30 11:33:08 +02:00
Laurent Destailleur
82a2a723c3 Fix: [ bug #1419 ] Margins module shows margin of sold services even if 
services module is disabled
 2014-05-29 21:01:00 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form 
Fix: pgsql driver
 2014-05-29 19:56:15 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Florian HENRY
f87772f3ec Add comment for travis 2014-05-29 14:56:55 +02:00
Florian HENRY
d15c3b2c23 CRLF 2014-05-29 14:30:09 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +02:00
aspangaro
e856e64bc9 Typo 2014-05-28 06:17:09 +02:00
aspangaro
b384f91096 Merge branch 'upstream/develop' 2014-05-28 05:35:35 +02:00
aspangaro
dce9c2bc76 Fiscal year - 1st step 2014-05-28 05:34:10 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep 
only user.
 2014-05-26 17:21:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
BENKE Charles
3d7b6e9a26 Update commonobject.class.php 2014-05-24 19:51:05 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
BENKE Charles
c8067931e3 Update commonobject.class.php 2014-05-19 09:32:42 +02:00
BENKE Charles
b210d7a00f Update commonobject.class.php 
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
 2014-05-18 14:59:20 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Florian HENRY
1f1a9e46fd Fix warning 2014-05-13 19:12:14 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Laurent Destailleur
f918ae7e4f Decrease log level for disabled trigger 2014-05-13 10:36:01 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d Start to clean code of templates to input lines 2014-05-12 12:53:10 +02:00
Laurent Destailleur
bb4eed0a1e Merge pull request #1591 from defrance69/patch-9 
Update commonobject.class.php
 2014-05-12 01:56:39 +02:00
Laurent Destailleur
6b1bdf9913 Merge pull request #1587 from aternatik/odt_thirdpartycontact 
Fix : bad call of extrafields into contact substitution
 2014-05-12 01:53:41 +02:00
BENKE Charles
8c8c641411 Update commonobject.class.php 
$objecttype == 'order_supplier' already tested on the previous else if
 2014-05-11 23:19:18 +02:00
Laurent Destailleur
8428caf8fb List cleaner 2014-05-11 21:59:35 +02:00
jfefe
04161084cf Fix : missing method to delete linked resource 2014-05-11 12:26:57 +02:00
jfefe
225c7ae07b New : link resource with any element 
With tpl system, external modules can declare resource with hook getElementResources
 2014-05-10 22:07:54 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Jean-François Ferry
bb58bed930 In commonoobject add method for adding resource to an element 2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab Move resource module functions into commonobject : 
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
 2014-05-10 22:03:05 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
jfefe
31044f1f72 Fix : bad call of extrafields into contact substitution (works with socpeople) 2014-05-10 18:51:54 +02:00
Laurent Destailleur
a627dd9ae8 Fix: Duplicate line when project has no tasks. 2014-05-09 17:14:40 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
3abede630b Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:36:01 +02:00
Laurent Destailleur
e214cdf231 Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:35:09 +02:00
Laurent Destailleur
460b5296ba Fix: [ bug #1353 ] Email notifications, wrong URL 2014-05-06 22:21:34 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
cc8dcacbc9 New: DolEditor can accepts percent instead of nb of cols for textarea 
mode.
 2014-05-05 13:41:25 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf Merge pull request #1567 from marcosgdf/doc 
Improved documentation of Societe and started type hinting variables
 2014-05-04 18:07:08 +02:00
Laurent Destailleur
5a9cca62a6 Clean code 2014-05-04 17:38:26 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
105d892d27 Corrected Translate::getLabelFromKey doc 2014-05-03 13:42:34 +02:00
Laurent Destailleur
e1d30837e9 Try to remove a warning 2014-05-03 03:10:58 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
7bb23086b8 Fix: Strict mode 2014-05-01 17:06:14 +02:00
Laurent Destailleur
6a53a4e0d2 Fix: doxygen 2014-05-01 16:43:40 +02:00
Laurent Destailleur
21716a0c7c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-01 16:27:16 +02:00
Laurent Destailleur
b56f59b313 Perf: Avoid to isntantiate object 'form' into 'subform' classes when 
already available.
Qual: Better information into xdebug page.
 2014-05-01 16:26:57 +02:00
Laurent Destailleur
ee6cac8294 Doc 2014-05-01 16:11:29 +02:00
Laurent Destailleur
0219d53f69 Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact 2014-05-01 11:22:32 +02:00
jfefe
fd45bb16bd Fix : make ODT substitution for company after contacts 2014-04-30 19:18:51 +02:00
Laurent Destailleur
a574aeff96 Qual: Removed warning 2014-04-30 15:30:20 +02:00
Laurent Destailleur
b11bd00e9a Fix: Removed blank lines at beginning of email when contact not defined 2014-04-30 15:17:39 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Jean-François Ferry
00cd616f4c Add informations about contacts of thirdparty into ODT 2014-04-30 10:36:23 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
Laurent Destailleur
8c5bc11def Qual: Better error message for LDAP connection 2014-04-27 14:16:29 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
4ade14b841 Qual: Removed code we should not have. 2014-04-26 16:15:35 +02:00
Laurent Destailleur
b117ea83be Fix: missing trans 
Fix: detection of html content
 2014-04-25 16:45:14 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
03d73bce9c Merge pull request #1550 from GPCsolutions/staticanalysis 
Various fixes to defects found using statical analysis tooling
 2014-04-23 21:20:39 +02:00
Laurent Destailleur
5e2c360d38 Merge pull request #1546 from GPCsolutions/linkfix 
Fix undeclared variable
 2014-04-23 21:13:06 +02:00
Raphaël Doursenaud
9960e5aa8f Qual: Removed unused variable 2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
d66ba0e026 Qual: Wrong type in method documentation 2014-04-23 18:24:01 +02:00
Raphaël Doursenaud
43606c8ac4 Qual: Fixed typo 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
b6312d1efd Qual: Missing method argument 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
af7d2d0b50 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
63166f3f5c Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
aa5d0b37b7 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
1bb99da8db Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Raphaël Doursenaud
0fa803977e Qual: Removed call to inexistant object 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
749973f1b6 Qual: Missing variable declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
32ad4461b8 Qual: Missing method argument 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0ca5a46345 Qual: Bad copy/paste 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
7039fd3892 Qual: Missing class property declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0be3d3bd2f Qual: Missing global declaration 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
9d7fc43951 Qual: Wrong type in method documentation 2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
cd774c0dcd Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
e3385119a4 Qual: Missing argument 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70cf592270 Qual: Wrong type in method documentation 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
2938ec06b2 Qual: Fixed typo 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
70c9dda964 Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
a22ead5e97 Qual: Wrong type in method documentation 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
b522d51d49 Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
258c92ab1c Qual: Avoid wrong declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
3eabffbc7c Qual: Missing global declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
d57b4192b6 Qual: Wrong variable name 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
670e861d7b Qual: Missing global declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
6cfcdbfe56 Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
84c9a390eb Qual: Mistyped class property 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
7cf553a636 Qual: Missing variable declaration 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
c8b1c3b57d Qual: Wrong type in method documentation 2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
284057d447 Qual: Wrong variable name 2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
4bf426c816 Qual: Undeclared variable replacement 2014-04-23 18:23:54 +02:00
Raphaël Doursenaud
e62edc0a72 Fix undeclared variable 2014-04-23 11:19:34 +02:00
Florian HENRY
ff597a899f add filter to effectif select 2014-04-22 11:20:19 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
Laurent Destailleur
4be113b2e8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-10 17:55:14 +02:00
Laurent Destailleur
30731e6c91 Fix: Must use $this 2014-04-10 17:51:42 +02:00
Laurent Destailleur
5d4b861156 Fix: Try/catch 
Conflicts:
	htdocs/core/class/conf.class.php
 2014-04-09 17:09:38 +02:00
Laurent Destailleur
b586b74c79 Fix: Try/catch 2014-04-09 17:07:27 +02:00
Laurent Destailleur
13929bc46f New: showrefnav can be used with tables without prefix. 2014-04-09 13:19:31 +02:00
Laurent Destailleur
41a2ce1a74 Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 
Conflicts:
	htdocs/comm/propal.php
 2014-04-06 21:21:08 +02:00
Laurent Destailleur
a2531872cb Fix: [ bug #1319 ] Erreur d'affichage des remises dans les propales 2014-04-06 21:17:35 +02:00
Laurent Destailleur
688ce704ec Fix: Doxygen 2014-04-05 15:14:19 +02:00
Laurent Destailleur
262efb997f Fix: paddingrightonly must use $right and $left to be compatible with 
LTR languages.
 2014-04-02 18:45:59 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Florian Henry
a2a46f9300 Extrafield select form table do not display selected value on edit mode 2014-04-02 11:34:15 +02:00
Laurent Destailleur
d2cb5e8d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-31 22:56:47 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor 
decide (currently ckeditor is disabled with android).
 2014-03-31 13:25:40 +02:00
Laurent Destailleur
c81406c7f3 Fix: CI 2014-03-31 02:41:15 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
9e771269c4 Qual: clean code 2014-03-26 20:46:17 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
Laurent Destailleur
4bd6f11112 Backport fix to solve warning problems. 2014-03-21 18:35:50 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
81b8961dab Qual: Dead code war 2014-03-17 11:13:53 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
6cec011df6 New: Add manager name (ceo, director, president...) into main company 
information page.
 2014-03-13 12:22:53 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
afca98323b Fix: Miscellaneous bugs on tasks management 2014-03-11 20:38:29 +01:00
Laurent Destailleur
c082d7c82e Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/main.inc.php
 2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
 2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f Fix: Compatibility with v4 of ckeditor (for debian) 2014-03-08 14:06:01 +01:00
Laurent Destailleur
2c0f1340d5 New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
Laurent Destailleur
15aebfb7a3 Merge pull request #1455 from marcosgdf/bug-loadban 
Corrected bug when creating document from ODT template
 2014-03-06 18:38:56 +01:00
Marcos García de La Fuente
ca0eb7919e Corrected call to non-existing function 2014-03-06 09:02:36 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
206181a542 Merge pull request #1441 from syrus34/patch-3 
Update commondocgenerator.class.php
 2014-03-01 13:40:14 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
syrus34
dbdb8de79d Update commondocgenerator.class.php 
With version 3.5, a company can have several bank account
 2014-02-28 07:06:38 +01:00
Laurent Destailleur
0c2ca119d7 Fix: Add a test to avoid the non stable and experimental fuc... 
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
 2014-02-26 16:51:38 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
855dac45ea Fix: select_comptes was always making a filter on field clos making 
other filter field not working in some case.
 2014-02-26 15:29:40 +01:00
Laurent Destailleur
f537f62aea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/impayees.php
 2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
5a29b3d546 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/societe/soc.php
 2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
5780f14a65 Qual: Removed TODO and add test to report bug. 2014-02-17 18:27:45 +01:00
Laurent Destailleur
867c83680b Merge remote-tracking branch 'origin/3.5' into develop 2014-02-17 18:22:49 +01:00
Laurent Destailleur
342ee2e6f6 Qual: Add a TODO to warn to remove this bug. 2014-02-17 18:22:15 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
e1efd88155 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-02-17 15:22:02 +01:00
Laurent Destailleur
8839ae38d3 Fix: [ bug #1241 ] error in request in select_paper file 
/core/class/html.formadmin.class.php
 2014-02-17 15:21:19 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +01:00
Laurent Destailleur
1a3bace4e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-14 12:59:26 +01:00
Laurent Destailleur
3e3c541e4c Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.
 2014-02-14 12:54:04 +01:00
Laurent Destailleur
d6ba18cc20 Merge pull request #1416 from syrus34/patch-2 
Add fields company_iban and company_bic
 2014-02-13 17:53:08 +01:00
philippe
6f129c3800 display adherent module for external user 2014-02-13 16:36:34 +01:00
syrus34
79d85d5888 Add fields company_iban and company_bic 2014-02-12 18:58:12 +01:00
Laurent Destailleur
634c5b64f1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/product/fiche.php
 2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139 Fix: colspan for extrafields 2014-02-12 00:23:15 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
9a985821d2 Fix: doxygen 2014-02-04 21:08:25 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
408a028320 Fix: Must return a string 2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
BENKE Charles
b86322c14a Update commonobject.class.php 
hook module need extrafields parameter too
 2014-02-01 12:55:05 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
557fb0a9b1 Fix: miscellaneous css problems 
Fix: Version was missing into home page when login was already done.
 2014-01-26 18:30:45 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d Fix: doxygen errors 2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal 
clone of propal improvements
 2014-01-24 01:33:15 -08:00
Laurent Destailleur
e85cf332b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
73be349233 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 23:47:58 +01:00
Laurent Destailleur
6253385b17 Fix: Thumbs was not visible when file was uploaded with extension in 
upper case.
 2014-01-19 22:51:24 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +01:00
Laurent Destailleur
c5bcc92651 Rename tag note to differentiate public and private note 2014-01-16 00:07:45 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
c3da8ca80a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-10 01:25:55 +01:00
Laurent Destailleur
7b63ce1f31 Doxygen 2014-01-10 00:57:17 +01:00
Laurent Destailleur
0b071ac4f1 Merge pull request #1369 from jfefe/fix_extrafield_list 
Fix : when using several field for label into sellist extrafields
 2014-01-09 06:41:27 -08:00
jfefe
77a1d6a43a Bad value display when using several label into sellist extrafield 2014-01-09 02:40:34 +01:00
jfefe
f554464690 New : ajax list for extrafields list and sellist 2014-01-09 02:10:03 +01:00
jfefe
f1d1522478 Fix : when using several field for label into sellist extrafields traduction is not needed. 
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
 2014-01-09 01:49:59 +01:00
Laurent Destailleur
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
 2014-01-07 16:41:00 +01:00
Laurent Destailleur
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f Fix: Bugs into permissions for module category 2014-01-07 14:55:03 +01:00
Laurent Destailleur
2d8214a940 Fix: The delete button into ecm module does not work when ajax disabled. 2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa Fix: W3C. Input fields can be between a table and tr tag. 2014-01-05 18:30:35 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
504b519fb7 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:37:06 +01:00
Laurent Destailleur
5fd47b34b0 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:30:32 +01:00
Laurent Destailleur
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
2f5932026e More information returned into return code 2013-12-13 18:33:05 +01:00
Laurent Destailleur
286bdf91d4 Better detection of corrupted module files. 2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426 Better detection of corrupted module files. 2013-12-10 16:25:27 +01:00
Laurent Destailleur
8fb0986303 New: Add path file of trigger into admin trigger list page 2013-12-10 15:49:57 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Florian Henry
a2368daa57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-17 17:07:00 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place. 
Fix: Reset of amount was not working
 2013-11-16 14:26:42 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
fa43476890 Fixed methods description 
These methods were declared void but actually returns values. Added proper documentation.
 2013-11-07 21:02:50 +01:00
Laurent Destailleur
cf8ff25d5b Minor enhancement with link feature 2013-11-07 02:56:56 +01:00
Raphaël Doursenaud
f11f9b0a69 Added missing copyright 2013-11-06 10:33:29 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
4d490ea02b open link in new tab 2013-11-06 10:19:17 +01:00
Cédric Salvador
b34a613504 code formating 2013-11-06 10:19:17 +01:00
Cédric Salvador
f2535d74ea edit link lines function 2013-11-06 10:19:17 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e add a field for label input 2013-11-06 10:19:17 +01:00
Cédric Salvador
28bfb10dbd UI 2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b display links 2013-11-06 10:17:18 +01:00
Cédric Salvador
3f774adbd0 form to link a file 2013-11-06 10:11:40 +01:00
Laurent Destailleur
addedb6f15 Merge branch 'develop' of https://github.com/FHenry/dolibarr into 
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-11-05 19:53:49 +01:00
Laurent Destailleur
b18e125143 Merge pull request #1279 from aspangaro/skype 
Task 157 : add a Skype button
 2013-11-05 05:33:33 -08:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
Florian Henry
0d2a019c3f Extrafield : better filter on select from table management for 
extrafields table
 2013-11-05 11:26:13 +01:00
aspangaro
76263213ab Merge branch 'origin/develop' 2013-11-04 22:04:36 +01:00
aspangaro
8fd021bf36 Merge branch 'upstream/develop' 2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Florian Henry
35c0695513 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-04 19:21:26 +01:00
Florian Henry
a57afb6d40 [ task #1127 ] Add feature filter on extrafield type : select for table 2013-11-04 19:21:13 +01:00
Laurent Destailleur
c815bd96fb Doxygen 2013-11-04 16:50:41 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
 2013-11-01 17:58:38 +01:00
Laurent Destailleur
f8e3a3e38a Fix: Sub level of dir must not always be visible. So I added parameter 
"showrelpart". Default value is old behaviour (only filenmae is
visible).
 2013-11-01 17:36:22 +01:00
Laurent Destailleur
44a78ca884 Merge pull request #1262 from defrance69/patch-17 
Update html.formfile.class.php
 2013-10-31 04:49:01 -07:00
Laurent Destailleur
154a75cc39 Merge pull request #1268 from FHenry/develop 
Add NL_nl translation for category contact
 2013-10-31 04:38:52 -07:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Christophe Battarel
ba0273ccc4 fix bad rounding on margin calculation and display 2013-10-30 18:17:37 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE 
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
 2013-10-30 12:24:51 +01:00
Laurent Destailleur
b3a0510407 Fix: Allow text input for hour. 2013-10-30 11:57:32 +01:00
Laurent Destailleur
5b3ba85669 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem 
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
 2013-10-29 17:52:13 +01:00
Laurent Destailleur
953f638cb4 New: Sort combo list for type of thirdparties. 2013-10-28 02:13:07 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Laurent Destailleur
197ae822d4 Merge pull request #1263 from FHenry/develop 
Fix list propal and invoice to display customer ref if option is set
 2013-10-26 17:13:07 -07:00
Laurent Destailleur
f67537799b Fix: Wrong usage of new preoutput confirm box 2013-10-26 18:46:07 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Florian Henry
9804527216 Fix bug in option display account number in list 2013-10-23 11:25:42 +02:00
Laurent Destailleur
14717e6279 Comment 2013-10-22 00:30:55 +02:00
BENKE Charles
15b1507c84 Update html.formfile.class.php 
Add subfolders feature in GED managment
 2013-10-20 20:58:38 +02:00
Laurent Destailleur
0d36329336 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-14 15:56:42 +02:00
Regis Houssin
8daef9d99f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-12 11:58:57 +02:00
Regis Houssin
bc0f65b73c Fix: reorder lines problem 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Laurent Destailleur
559b75c49b New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID. 2013-10-11 12:14:14 +02:00
Laurent Destailleur
b0e38f7619 Fix: Manage strange language code reported bu chrome browsers. 2013-10-11 10:01:47 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
ca24b45aa9 Merge pull request #1101 from PaulPoulain/940-develop 
940 develop
 2013-09-26 05:00:57 -07:00
Laurent Destailleur
c88072433c Merge pull request #1244 from defrance69/patch-12 
Update commonobject.class.php
 2013-09-25 08:18:49 -07:00
BENKE Charles
1c988fc559 Update commonobject.class.php 2013-09-25 11:14:50 +02:00
BENKE Charles
f88470d3b8 Update html.formcompany.class.php 
use paramter to select only active type of contact
 2013-09-25 10:17:27 +02:00
BENKE Charles
b400803a2a Update commonobject.class.php 
add complementary param
 2013-09-25 10:15:32 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
BENKE Charles
d978d64d59 Update commonobject.class.php 
just the active type of contact
 2013-09-24 14:19:52 +02:00
Laurent Destailleur
6b2966794a Do not show free text for thirdparty email send form 2013-09-23 14:35:22 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00
Laurent Destailleur
7ed5d5e543 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-23 11:25:06 +02:00
Laurent Destailleur
31d3e419b2 Fix: doxygen 2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2 New: Add method to use a dictionnary as a combo box. 2013-09-22 23:54:01 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
b20b82df3d Fix: we must use conf-currency as parameter of method price instead of 
using langs->getCurrencySymbol
 2013-09-15 13:04:38 +02:00
Laurent Destailleur
57dee255a2 Normalize code 2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
BENKE Charles
085a8d68db Update html.formother.class.php 
bugfix
 2013-09-14 10:41:36 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
Laurent Destailleur
74f8a19134 Qual: Make code simpler 2013-09-11 15:17:31 +02:00
Raphaël Doursenaud
9636e1aafc Replaced PHP 5.5 deprecated calls 2013-09-11 14:48:02 +02:00
Laurent Destailleur
fd17280521 Removed all checkstyle errors 2013-09-11 09:40:00 +02:00
Laurent Destailleur
f195d59c9c Try to fix false positive with dolgraph 2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9 Try to fix false positive with dolgraph 2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8 Try to fix false positive with dolgraph 2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00
Laurent Destailleur
9314859ead More log to find bug 2013-09-10 15:21:56 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
c147fc6016 Fix: checkstyle 
Try phpcs into travis
 2013-09-10 02:09:55 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Raphaël Doursenaud
cd684460ff Removed silly code 2013-09-05 17:30:17 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a Fix: Remove debug print 2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97 Fix: select list on external table 2013-09-02 00:34:41 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop 
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
 2013-09-01 15:01:33 -07:00
Laurent Destailleur
8cd1563f58 More test 2013-09-01 20:55:59 +02:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select 
thirdparty list
 2013-08-30 18:18:58 +02:00
lalaina rasamoelina
3156f8cae0 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-29 09:30:26 +02:00
lalaina rasamoelina
ca6a973d96 T940-develop: creating a bouton which permit to create an event in the propal,and command . 
If we create an event in the propal, then  the events will be attached in the propal
		and if it's for command,it will be attached in the command
 2013-08-27 15:51:06 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution. 
Add limit and add entry other.
 2013-08-27 11:54:07 +02:00
Laurent Destailleur
903b75c1cd Merge pull request #1165 from PaulPoulain/975-develop 
T975-develop: Don't print the mail of the contact who is gone
 2013-08-25 03:23:26 -07:00
Laurent Destailleur
6d2c27beec Fix: header already sent 2013-08-24 22:09:32 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople 
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Laurent Destailleur
327aa80ed0 Fix: Error management 
New: Autoselect category in list if there is only one element in list.
 2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb Qual: Clean code by moving synchro with mailman into mailman trigger 
New: A trigger can return an array of error strings instead of one error
string.
 2013-08-21 12:39:20 +02:00
simnandez
913888824f Remove duplicate $user 2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
220f9b7e9f define global user variables so templates can manage user permissions 2013-08-20 12:01:52 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty 
value.
 2013-08-20 11:51:24 +02:00
simnandez
3577025f0e Fix update extrafield do not display immediatly 2013-08-14 09:56:08 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
3502747247 Merge pull request #1175 from FHenry/develop 
Add pdf link into supplier invoice list and supplier order list
 2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
Laurent Destailleur
bfd2d7ada2 Fix: Sort order works with special chars. 2013-08-08 20:06:56 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596 Fix: Param must be a regex string 2013-08-06 19:23:43 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
928446596d Perf: Optimize memory usage when generating graph. 2013-08-05 18:30:10 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00