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

5268 Commits

Author SHA1 Message Date
Laurent Destailleur
4076a4a643 Fix: select_date accepts -1, '' or a date but not '0' 2014-05-25 14:51:56 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
d7d8eba6b1 Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list 
Fix page numerotation for product, invoice and others as in company list
 2014-05-14 11:26:22 +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
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
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
 2014-05-13 01:29:01 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
3393b1c5fb Fix: Date of invoice is set to current date when cloning. // TODO Best 
is to ask date into confirm box.
 2014-05-12 12:15:54 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
aspangaro
4025fda62a Merge branch 'upstream/develop' 2014-05-11 20:53:15 +02:00
Laurent Destailleur
bafc53ad95 Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error 2014-05-11 19:05:51 +02:00
Laurent Destailleur
76330ad04a Fix: [ bug #1383 ] When add a salary payment - In bank, link "user" 
doesn't work
 2014-05-11 18:35:25 +02:00
aspangaro
bb5d800524 Print instead of echo 2014-05-11 06:49:11 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Laurent Destailleur
f36b9effe8 Fix: [ bug #1373 ] Required type of payment input is not visible 2014-05-10 17:22:12 +02:00
Laurent Destailleur
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +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
5a6ad1ef5f Fix: [ bug #1362 ] Note is not saved 
Fix: tr/td balance.
 2014-05-06 23:19:48 +02:00
Laurent Destailleur
5e12459ad1 Fix: Ref and date for social contributions payments were merged into on 
field making not possible to click on ref.
 2014-05-06 22:54:33 +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
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
bc35728ea3 Merge pull request #1562 from marcosgdf/translation 
Improved translations
 2014-05-04 17:39:36 +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
Laurent Destailleur
12aa541db4 Clean code 2014-05-02 17:58:26 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Marcos García de La Fuente
5d46115dd3 Missing translation of transaction types in releve detail 2014-05-01 16:32:04 +02:00
Laurent Destailleur
6a200105b9 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234 Merge pull request #1557 from defrance69/develop 
export extrafields on bill & set real ref bordereau number
 2014-05-01 11:09:16 +02:00
aspangaro
270e58637f Salaries payments :: Add sortfield & search 2014-05-01 08:58:19 +02:00
aspangaro
ca0b6c26df Translation 2014-05-01 08:19:55 +02:00
aspangaro
3b265c8d53 TVA :: Add sortfield & search 2014-05-01 07:44:10 +02:00
aspangaro
c6e2afb11e Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"] 2014-05-01 05:57:27 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
aspangaro
4caedaf3e5 Salaries : typo & presentation 2014-04-30 06:38:36 +02:00
aspangaro
eb926103e0 TVA : Add type_payment & num_payment who are missing 2014-04-30 06:37:47 +02:00
aspangaro
11b0bc4b38 Merge branch 'upstream/develop' 2014-04-30 04:58:07 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
aspangaro
06b386443d Merge branch 'upstream/develop' 2014-04-29 06:37:39 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
aspangaro
bab54f8264 Type bank & tva 2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872 Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated 2014-04-28 04:53:39 +02:00
aspangaro
9ff3dc6189 Fix :: MySql Problem when create a salary payment 2014-04-28 04:43:17 +02:00
aspangaro
e03be4f6ed HRM Area - Typo & presentation 2014-04-27 04:08:34 +02:00
Laurent Destailleur
01655d1757 New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send 
invoice
by email whatever is its status.
 2014-04-23 13:14:55 +02:00
Florian Henry
0d1697589e syntax 2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab syntax travis ruleset.xml 2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2 Add filter date and total line on bank writing list page 2014-04-13 18:26:21 +02:00
aspangaro
bae2fe0921 Merge branch 'upstream/develop' 2014-04-12 09:51:19 +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
5843668dbe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-11 19:02:59 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
Juanjo Menent
f458c384d7 Fix: Can not make withdrawals 
Conflicts:
	ChangeLog
 2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232 Fix: Can not make withdrawals 2014-04-11 12:07:01 +02:00
Laurent Destailleur
55599f9455 Fix: MAIN_AUTOFILL_DATE was broken in some cases. 2014-04-10 19:47:52 +02:00
Laurent Destailleur
ebb9016ad5 Fix: missing 'ifone' into param 2014-04-02 19:34:42 +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
918fe5dbb5 Fix: [ bug #1318 ] Problem with enter key when adding an existing 
product to a customer invoice
 2014-04-02 11:58:59 +02:00
Laurent Destailleur
f891e1ac42 Fix: use currency into price function 2014-04-02 00:01:06 +02:00
Laurent Destailleur
c81406c7f3 Fix: CI 2014-03-31 02:41:15 +02:00
Laurent Destailleur
39f48f25db Fix: Trip and expenses were moved into menu hrm 2014-03-31 01:48:50 +02:00
Laurent Destailleur
d48cbeb720 Fix: W3C 2014-03-31 01:45:48 +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
3d8fb60f94 Start to implement sepa format. Need serious tests. 2014-03-30 20:22:54 +02:00
aspangaro
6e0788c8c1 Merge branch 'upstream/develop' 2014-03-30 08:07:07 +02:00
Laurent Destailleur
81306ff1d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-29 17:38:29 +01:00
Laurent Destailleur
a5c2b78565 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-29 17:38:06 +01:00
Laurent Destailleur
88a4af394c Removed dead or useless code. 2014-03-29 14:12:01 +01:00
aspangaro
52cd8792b7 Merge branch 'upstream/develop' 2014-03-29 06:50:34 +01:00
Laurent Destailleur
205c0ac62d Fix: invert logic. Show child options when parent option is 
selected instead of selected parent when a child is selected.
 2014-03-29 05:18:24 +01: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
Juanjo Menent
a1fb21114b New: Add some hooks for financial reports 2014-03-28 18:31:43 +01:00
aspangaro
e0dc01fe85 Merge branch 'upstream/develop' 2014-03-28 12:37:42 +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
c45f509984 Qual: Uniformizing payments 2014-03-26 15:41:09 +01:00
Laurent Destailleur
59042a30e1 Fix and uniformize code for payment of salaries. 2014-03-25 21:35:52 +01:00
Laurent Destailleur
4828d1e89a New: Uniformize visible information on payment lists. 2014-03-25 20:24:51 +01:00
Laurent Destailleur
a5e8063cfd Fix: Bad management error 2014-03-25 20:09:30 +01:00
Florian Henry
bb07d7f814 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-24 13:25:35 +01:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
57bd043f59 Fix: Missing lang loading 2014-03-23 20:30:54 +01:00
aspangaro
bc48ddd3fc Présentation 2014-03-23 16:33:05 +01:00
aspangaro
7e1035171c Merge branch 'upstream/develop' 2014-03-22 05:55:14 +01:00
Florian Henry
c8c4a10a06 Fix restrictedearea bug 2014-03-21 16:18:17 +01:00
Florian Henry
10fda1956f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-21 14:41:18 +01:00
aspangaro
07d6464720 Trips & expenses move into hrm area 2014-03-20 06:38:07 +01:00
Laurent Destailleur
a9aaac8e15 Fix: Date was lost if error during submit. 2014-03-20 00:05:20 +01:00
Laurent Destailleur
68396e023c New: When creating an invoice all types are visible (even if for the 
moment we just show an help text to explain how to use type credit note
and deposit).
 2014-03-19 23:49:07 +01:00
Laurent Destailleur
caf1eba4e2 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
 2014-03-19 22:59:10 +01:00
Laurent Destailleur
4afb85bd1d Fix: Several fix into workflow/condition for invoice payments or convert 
into discount.
 2014-03-19 22:30:25 +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
aspangaro
4d6d7c19b2 Correct typo 2014-03-17 21:47:06 +01:00
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +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
649f535d56 delete extrafield on delete invoice 2014-03-15 19:49:21 +01:00
Laurent Destailleur
ad23c88f1a Merge pull request #1481 from atm-maxime/mko672 
Add : Stock can be mandatory to use a product
 2014-03-15 17:29:31 +01:00
Maxime Kohlhaas
1911f6fcdc Task 672 : add stock limitation on shipment + translation 2014-03-15 14:59:27 +01:00
Alexis Algoud
839641feaf Add option to set value of credit note by invoice lake of payment 2014-03-15 14:52:08 +01:00
Laurent Destailleur
7a304bff62 Merge pull request #1478 from atm-alexis/develop 
Add feature : import line from origin invoice in the new credit note
 2014-03-15 13:48:12 +01:00
Maxime Kohlhaas
b6a2fa61c8 Task 672 : only for product not services 2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8 Task 672 : Prevent use of product not available 2014-03-15 12:45:56 +01:00
Alexis Algoud
3a21d99edf Add feature : import line from origin invoice in the new credit note 2014-03-15 12:01:13 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
Florian Henry
3f6b319d41 Fix deposit invoice 2014-03-14 23:42:45 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor 
Minor style and translation corrections
 2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
0a603777ae Added missing spacing 2014-03-11 11:27:06 +01:00
aspangaro
99b2dfda77 Correct Travis Error 2014-03-11 10:52:49 +01:00
aspangaro
d97f9e50cd Merge branch 'upstream/develop' 2014-03-11 10:40:22 +01:00
Laurent Destailleur
932b421d1d Merge remote-tracking branch 'origin/3.5' into develop 2014-03-11 09:46:51 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
61a5735300 Rename "Sal" class into "Salaries" 2014-03-10 21:17:03 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7 Fix: Must use div for columns of index pages. Not table. 2014-03-10 17:19:02 +01:00
aspangaro
74d3fdae15 Update langs & fix period for salaries in tax module 2014-03-07 06:42:48 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
7d7a72b8f1 More interactive autoselect of fields 2014-03-01 20:02:35 +01:00
Laurent Destailleur
d69cee03d8 More interactive autoselect of fields 2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are 
used for calculation.
 2014-03-01 19:11:13 +01:00
Laurent Destailleur
19b68e87e9 Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1123

Conflicts:
	ChangeLog
 2014-03-01 13:29:34 +01:00
Laurent Destailleur
a453d24eea Merge pull request #1437 from marcosgdf/invoice-types 
Replacing invoice integer types with Facture and FactureFournisseur constants
 2014-02-27 11:11:19 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
Marcos García de La Fuente
0eedadd7f2 Replacing invoice integer types with Facture constants 2014-02-26 01:09:22 +01:00
Marcos García de La Fuente
8099d7ff42 Replacing invoice integer types with Facture constants 2014-02-26 01:03:26 +01:00
Marcos García de La Fuente
ad928cb443 Replacing invoice integer types with Facture constants 2014-02-26 00:56:36 +01:00
Marcos García de La Fuente
f464528dd9 Corrected indentation to tabs 2014-02-25 01:18:29 +01:00
Marcos García de La Fuente
e83e2bbbd7 Fixed bug #1123: Paid deposit invoices are always shown as partially paid when fully paid 2014-02-25 01:17:38 +01:00
Marcos García de La Fuente
e90f068e3b Documented invoice types 2014-02-25 01:10:18 +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
Laurent Destailleur
37d2d990af Add comment into doc 2014-02-24 10:17:56 +01:00
Florian Henry
ec8ad9f8bb codesniffer 2014-02-23 20:10:05 +01:00
Florian Henry
720746b1b2 Fix php sniffer 2014-02-23 16:29:16 +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
Florian Henry
e3ca6cf3d3 Fix phpunit code siffer errors 2014-02-23 10:47:51 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +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
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
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
b499efeccf Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/sociales/index.php
	htdocs/compta/tva/index.php
 2014-02-12 22:29:56 +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
e71fb36b3c Add patch ISO 9362 http://fr.wikipedia.org/wiki/ISO_9362 manually. 
We keep bic size field to 20 instead of 11 for backward compatibility.
 2014-02-10 01:08:49 +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
fdfb7f1a8a Fix: Be sure there is no duplicate default rib. 2014-02-08 03:24:48 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2014-02-05 21:03:05 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
db006dcdf8 Fix: Missing lang->load 2014-02-05 12:52:00 +01:00
Laurent Destailleur
f8a68b0449 Fix: Missing translation 2014-02-04 20:57:22 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments. 
New: Add warning if supplier payment is higher that due amount.
 2014-02-03 18:42:24 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +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
Maxime Kohlhaas
06bbc48399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-21 09:03:25 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Maxime Kohlhaas
7e8a7f7e7f Allow to clone an invoice on a different third 2014-01-17 15:44:06 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +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
eae92695d6 Fix: Warning into bank conciliation feature. 2014-01-09 18:47:33 +01:00
Maxime Kohlhaas
364085bd20 Fix : wrong var used in bank account class 2014-01-09 18:42:35 +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
283297294b Fix: Missing definition of status labels 2014-01-05 16:19:25 +01:00
Laurent Destailleur
f0503dfaa9 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/compta/stats/cabyprodserv.php
	htdocs/compta/stats/casoc.php
 2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22 Fix: Bad SQL request when using filter on category. 2014-01-03 18:16:21 +01:00
Laurent Destailleur
49f3242796 Merge pull request #1357 from marcosgdf/payment_menu 
Payment menu
 2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +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
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Florian Henry
e971e4dfff Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal 2013-12-23 11:05:14 +01:00
simnandez
d8644ec04c Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:47:35 +01:00
simnandez
11353786a1 Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:46:19 +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
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
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
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
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +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
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
db10740e2a Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks 
Feature/multicompanybookmarks
 2013-12-13 18:52:38 -08:00
Laurent Destailleur
c94083b56e Fix: W3C. No form into table. Make some browsers crazy. 2013-12-14 02:33:44 +01:00
Alexis Algoud
4844aed67e Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4 In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. 
Ex in agefodd module:
	$obj_link=new Propal($db);
        $obj_link->id=$agf->propalid;
        $resultdel=$obj_link->delete($user);

To prevent misuse of the function, the reference is not considered given
 2013-12-11 15:14:29 +01:00
Laurent Destailleur
75703a03cc Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-10 21:48:22 +01:00
Raphaël Doursenaud
5ba9a1134b Removed dead code 2013-12-10 11:38:02 +01:00
Laurent Destailleur
a89a4ee81a Fix: Delete vat entry when bank line was already deleted. 2013-12-09 22:39:41 +01:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
b0e18348d9 Fix: Test must never be done on a translated string 2013-12-08 16:39:47 +01:00
Laurent Destailleur
533199c151 Fix: Missing translation and missing comments 2013-12-03 20:54:22 +01:00
Laurent Destailleur
01c91c7194 Fix: Missing translation and missing comments 2013-12-03 20:44:31 +01:00
Laurent Destailleur
6c26684284 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:16:18 +01:00
Laurent Destailleur
30428ec6e5 Fix: Control on minimum amount must be one only on standard and 
replacement invoices.

Conflicts:
	htdocs/compta/facture.php
 2013-12-01 19:41:29 +01:00
Laurent Destailleur
a6e4ba7001 Fix: No limits for drafts lists 2013-12-01 19:40:36 +01:00
Laurent Destailleur
27c6b30651 Fix: Control on minimum amount must be one only on standard and 
replacement invoices.
 2013-12-01 18:56:20 +01:00
Laurent Destailleur
6e96d60c6c Fix: No limits for drafts lists 2013-12-01 18:53:16 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Florian Henry
afc729c694 [ bug #1153 ] SQL Error on the VAT main screen (with pgsql) 2013-11-27 22:49:54 +01:00
Laurent Destailleur
6729f03ee6 Merge pull request #1323 from grandoc/3.5 
fix language and standardize code
 2013-11-26 07:28:30 -08:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
Grand Philippe
203a98d4ae fix language and standardize code 2013-11-25 10:30:02 +01:00
Laurent Destailleur
f6f4f425af Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:31:04 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:19:21 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:07:13 +01:00
Laurent Destailleur
7871ccb9aa Fix: [ bug #1094 ] Invoice Text Reminder 2013-11-21 02:02:31 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again 
FIXME: Factorize!
 2013-11-19 17:54:36 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +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
Laurent Destailleur
d0d9cce146 Fix: price should not be used to compare amounts. Price is a formated 
string, not an amount.
 2013-11-15 22:15:48 +01:00
simnandez
618bf4d75e Remove td 2013-11-15 17:48:19 +01:00
simnandez
0aba9b02b8 Add alert for outstanding bill 2013-11-15 17:43:13 +01:00
aspangaro
e8c7bb9c62 Fix for language 2013-11-14 21:02:33 +01:00
Laurent Destailleur
4b3778d116 Merge pull request #1292 from aspangaro/3.4 
fix for language
 2013-11-09 16:08:19 -08:00
aspangaro
bb69fcf0d7 Fix for language 2013-11-09 07:00:59 +01:00
aspangaro
9170259351 fix for language 2013-11-09 06:51:10 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
b82cbf1385 Fix: current balance was visible when it should not 
Conflicts:
	htdocs/compta/bank/account.php
 2013-11-06 15:35:10 +01:00
Laurent Destailleur
521b3a89bf Fix: current balance was visible when it should not 2013-11-06 15:31:56 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
Laurent Destailleur
2f47b0fcfd Fix: picto for status8 is a flash red icon to report a critical error 
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
 2013-11-04 23:56:15 +01:00
Laurent Destailleur
5e246107a7 Doxygen 2013-11-04 16:31:12 +01:00
Laurent Destailleur
b2df689669 Merge pull request #1274 from FHenry/3.4 
USe good status icon for thirdparty ActivityCeased
 2013-11-03 13:18:37 -08:00
aspangaro
a9dd9d6dfc Modify the presentation of the card 2013-11-03 15:07:26 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Florian Henry
6aea0bf7a1 Fix [ bug #1105 ] Searching Boxes other search option 2013-11-02 12:49:37 +01:00
Laurent Destailleur
d8216a09e1 Fix: Try a fix to avoid error on big sql 2013-10-31 14:39:41 +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
Florian Henry
17df92c654 Fix [ bug #1116 ] Silent Warning when validating a customer invoice 
[PostgreSQL]
 2013-10-26 16:01:02 +02:00
Laurent Destailleur
837d5f2e76 Qual: Normalize code of vat class 
New: Can enter a vat payment of zero.
 2013-10-25 19:27:38 +02:00
Florian Henry
bdcbd4ee42 Fix list propal and invoice to display customer ref if option is set 2013-10-22 12:47:26 +02:00
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into 
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
 2013-10-20 14:12:56 +02:00
Laurent Destailleur
e5bc7d29d0 Fix: Validation of contract lose the new ref into trigger. 
Fix: Validation of contract was not using transaction
Fix: Validation of contract did not renamed uploaded directory.
 2013-10-18 10:17:06 +02:00
Laurent Destailleur
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Laurent Destailleur
07d04b7905 Fix: syntax error 2013-10-14 16:12:07 +02:00
Maxime Kohlhaas
0994184bf9 Fix invoice fetch on payment page 2013-10-14 09:45:32 +02:00
Maxime Kohlhaas
387e0ab50b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-10-14 09:42:10 +02:00
Laurent Destailleur
303cad162b Qual: Show the rule name used to make calculation and link to change 
rule.
 2013-10-10 19:33:49 +02:00
Laurent Destailleur
383ead9234 Fix: remove a test output 2013-10-10 17:30:28 +02:00
Maxime Kohlhaas
d6da871381 Add object declaration on paiment 2013-10-10 09:31:37 +02:00
Laurent Destailleur
a11a0d6491 Fix: debug replanishment feature 2013-10-09 21:09:15 +02:00
Laurent Destailleur
47a9837046 Uniformize ref_customer into list 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
 2013-10-07 21:58:12 +02:00
BENKE Charles
53531ff847 Update facture.php 2013-10-06 17:23:31 +02:00
BENKE Charles
ca0ba99eff Update facture.php 2013-09-27 22:08:06 +02:00
BENKE Charles
fff1309cec Update facture.php 2013-09-27 22:06:05 +02:00
Maxime Kohlhaas
4a20a29521 Add hook on paiementcard + fix hook on expedition 2013-09-27 11:00:25 +02:00
Maxime Kohlhaas
383e07d102 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-09-26 18:20:12 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
5341811ec0 Fix: Clean awful code 2013-09-23 12:31:10 +02:00
Maxime Kohlhaas
00cb2aa26c Fix : wrong var used in bank account class 2013-09-23 10:55:44 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
16396b985b Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on 
last line.
 2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +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
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
16e2de1d7b Merge pull request #1228 from csalvador/develop 
Added a field to group by to avoid error with mysql strict mode
 2013-09-12 02:06:31 -07:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
c1c423dcac [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 17:49:36 +02:00
simnandez
634f70a74d New: [ task #1060 ] Register fields localtax(1|2)_type into details 
tables. Invoices
 2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d Added a field to group by to avoid error with mysql strict mode 2013-09-10 16:45:05 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Cédric Salvador
0c93c6f0b1 format 2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f indentation 2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34 don't display warehouse selection if there's only one 
Conflicts:
	htdocs/compta/facture.php
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
 2013-09-09 09:55:51 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
082cf0b487 Revert "Avoid silly assignment" 
This reverts commit fa51e310b8.
 2013-09-07 19:27:35 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
fa51e310b8 Avoid silly assignment 2013-09-05 17:19:30 +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
Florian Henry
853758a422 REplicate extrafield value 
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
 2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e All deposit inoice form order 2013-08-30 10:46:05 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +02:00
Laurent Destailleur
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +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
67892575be Merge pull request #1167 from PaulPoulain/999-develop 
T999-develop: link invoice to a command
 2013-08-25 03:23:57 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
simnandez
fd759ade76 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:04:10 +02:00
simnandez
c242d66530 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:03:16 +02:00
lalaina rasamoelina
f913422e62 T999-develop: link invoice to a command 
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
 2013-08-22 10:17:03 +02:00
Christophe Battarel
dd32dbacb5 Fix retrieving of margin info when invoice created automatically from order (used by workflow module) 2013-08-21 18:55:11 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
7438809ab5 Make predefined invoice feature easier to use. 2013-08-06 23:55:17 +02:00
Laurent Destailleur
acf3db8512 Fix: Pb with predefined invoices 2013-08-06 23:50:12 +02:00
Laurent Destailleur
7a8d28f135 Several fix for last pull request: 
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
 2013-08-06 19:12:26 +02:00
Laurent Destailleur
7a17d52dad Merge pull request #1157 from PaulPoulain/961-develop 
T961-develop: Put the private note in the bill list
 2013-08-06 09:44:28 -07:00
lalaina rasamoelina
a8ba4e1861 T961-develop: Put the private note in the bill list 
In the invoice list, if there are the private notes,we print them and we can edit them
htdocs/compta/facture/liste.php
 2013-08-06 16:36:16 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +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
2336a260d3 New: Add line "minimum amount desired into bank graph". 2013-08-05 18:54:03 +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
Maxime Kohlhaas
229c2d890f Add possibility to define default VAT accountancy code for purchase 2013-08-02 10:43:53 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
db8af86111 Fix: W3C 2013-07-30 18:36:13 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
385d3612c5 Merge pull request #1136 from jfefe/extrarequired 
Missing checks on extrafields
 2013-07-27 03:09:44 -07:00
jfefe
bddbc6f6b2 Fix : show input fields if missing required extrafield when editing 
invoice
 2013-07-26 16:02:48 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
jfefe
371b40cc76 Do not create invoice if required extrafields are empty 2013-07-26 13:22:22 +02:00
Florian Henry
8721b7cfa7 Fix [ bug #1001 ] Charge sociale : état incorrect 2013-07-26 12:51:28 +02:00
Laurent Destailleur
de41e9e9c7 Qual: More responsive design 2013-07-26 12:45:31 +02:00
Laurent Destailleur
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Laurent Destailleur
55fc3165ba New: Can filter on status 2013-07-26 11:27:56 +02:00
Laurent Destailleur
9c88c03860 Fix: missing css class on tr 2013-07-25 13:56:07 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
BENKE Charles
0a1f483fd1 Update fiche.php 
Add feature to change refnumber of bank bordereau
 2013-07-21 10:10:49 +02:00
BENKE Charles
9f14ee8846 Update remisecheque.class.php 
add change number of remisecheque feature with the real number of the bank
 2013-07-21 10:08:58 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2013-07-19 17:33:29 +02:00
Laurent Destailleur
ad783cc4f1 Merge pull request #1112 from PaulPoulain/949-develop 
949 Put the ref_client in the subject mail
 2013-07-19 06:59:49 -07:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/ecm/index.php
 2013-07-19 14:01:47 +02:00
Maxime Kohlhaas
9d8438ecdd Minor fix on remisecheque display 2013-07-19 13:39:01 +02:00
Laurent Destailleur
3896cde299 Removed useless method. Prefer using generic method. 2013-07-19 13:38:57 +02:00
Maxime Kohlhaas
196bce7e11 Add link to RemiseCheque in account lines 2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
efff92fe1c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
4aa9d92a49 Display CheckReceipt on Payment card if exists 2013-07-19 09:17:54 +02:00
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Laurent Destailleur
d5ca2f9f40 Fix: forged select for stats where wrong when filtering on a thirdparty 
Conflicts:
	htdocs/compta/facture/class/facturestats.class.php
 2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26 Fix: forged select for stats where wrong when filtering on a thirdparty 2013-07-18 15:25:25 +02:00
lalaina rasamoelina
913f4d94cc Put the ref_client in the subject mail 2013-07-18 12:39:50 +02:00
Juanjo Menent
8bae6a774d Merge pull request #1095 from atm-maxime/develop 
Fix on turnover reports
 2013-07-16 23:47:56 -07:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Maxime Kohlhaas
7b5386692c Added w/o VAT on turnover report 2013-07-16 00:30:44 +02:00
Maxime Kohlhaas
bc0a52fa71 Fix : link to invoice list + SQL was bad when several invoices had the same amount on the same thirdparty 2013-07-16 00:29:03 +02:00
Laurent Destailleur
5fb707f918 Fix: Restore disappeared feature 2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/compta/facture/impayees.php
 2013-07-14 20:33:54 +02:00
Laurent Destailleur
dc5ad1a0f3 Fix: Total missing 2013-07-14 20:29:07 +02:00
Laurent Destailleur
0a3bd58645 Fix: Duplicate button 2013-07-14 03:28:19 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/account.php
 2013-07-13 23:41:32 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f Fix: Bug to delete bank line 2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235 Fix: Missing label 2013-07-13 17:25:10 +02:00
Laurent Destailleur
f009100126 Fix: Bad column 2013-07-12 16:51:31 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was 
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
 2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9 Prepare code to uniformize method addline. 2013-07-10 16:07:57 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
56676c925f Merge remote-tracking branch 'origin/3.4' into develop 2013-07-01 02:10:57 +02:00
Laurent Destailleur
59c97afeed Fix: Bad calculation. Missing global. 2013-07-01 02:10:22 +02:00
Laurent Destailleur
c37527a8a0 Fix: No currency into lists. 2013-07-01 01:59:07 +02:00
Laurent Destailleur
d8883dba7f New: Add new graphical boxes (customer invoices per month). 2013-06-28 19:19:18 +02:00
Florian Henry
1580f92b11 Fix bug for PGSQL Migration 3.4->3.5 
Fix bug on create invoice from contract
 2013-06-27 08:09:28 +02:00
Maxime Kohlhaas
76870622e4 Add turnover report by product / serv 2013-06-25 14:54:29 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Maxime Kohlhaas
0d3b7f1a0f merge 2013-06-24 10:01:23 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Florian Henry
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
simnandez
684c086ad0 Fix: param must be a string 2013-06-14 15:37:28 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Florian Henry
1ecc24216f Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:05:19 +02:00
Laurent Destailleur
0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into 
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2013-06-12 10:47:56 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Marcos García
cf6bfcc9c4 Missing translations 2013-06-08 20:31:39 +02:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Marcos García
532c56002d Entities problem with error message in predefined invoice creation 2013-06-08 19:07:13 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
simnandez
26b36f3a4e Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0 Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:30 +02:00
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +02:00
Laurent Destailleur
4133bfc3a4 Fix: Ton of bugs into bank categ editor (W3C, update error, syntax 
error...)
 2013-05-31 11:15:13 +02:00
Florian Henry
7c56da05b8 Add hook on propal/order/incoive list 2013-05-28 18:35:15 +02:00
simnandez
8d9b1e4788 Fix: Show date formatted 2013-05-22 10:51:45 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
fhenry
e19e9e1c63 Add dol_syslog 2013-05-17 21:27:15 +02:00
Laurent Destailleur
bbb843ec58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec Fix: Remove windows CR/LF 2013-05-15 18:14:37 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00
Laurent Destailleur
d92b46c9f9 Fix: Label missing 
Fix: Cancel not working
 2013-05-14 23:41:57 +02:00
Laurent Destailleur
fe9e8aab5e Fix: Label missing 
Fix: Cancel not working
 2013-05-14 23:39:17 +02:00
Laurent Destailleur
d7e9236455 Fix: Missing include 2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Laurent Destailleur
559bbdf19a Merge pull request #944 from defrance69/patch-8 
Update annuel.php
 2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
simnandez
050ca946e9 Fix: Debug of withdrawals rejects 2013-05-13 16:30:52 +02:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +02:00
simnandez
dbb0fa09ff Fix: Debug of withdrawals rejects 2013-05-11 18:36:44 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
BENKE Charles
ea130724b1 Update annuel.php 
Add Debt and Cred graphic at the bottom of the page
 2013-05-10 23:16:41 +02:00
simnandez
d228005e17 Fix: Remove windows CR/LF 2013-05-10 17:43:55 +02:00
fhenry
8542a4fd28 Fix date extrafield message old datetimeformat use message in log 2013-05-10 16:34:14 +02:00
Laurent Destailleur
d1d9a65de5 Merge pull request #940 from aponzio/develop 
Fixed odd translation
 2013-05-10 07:31:44 -07:00
Alessandro Ponzio
0817d035a3 Updated SQL query that fetches invoices by adding the 'ORDER BY' clause 2013-05-10 14:38:15 +02:00
simnandez
bf043fc845 Fix: Remove windows CR/LF 2013-05-08 09:28:05 +02:00
fhenry
37a9686921 Fix bug [ bug #884 ] Warnings on /compta/bank/index.php 2013-05-07 17:06:10 +02:00
fhenry
de4b9b01bf Fix Bug [ bug #880 ] Prelevement section is broken 2013-05-07 15:34:40 +02:00
Marcos García
44ef25a367 Converted recent changes to UTF-8 encoding 2013-05-06 18:10:41 +02:00
BENKE Charles
5c766d255f Update categ.php 
Add update label feature
 2013-05-03 16:02:04 +03:00
Laurent Destailleur
7382a97223 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2013-05-03 10:13:31 +02:00
Marcos García
c65620ab62 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866 
Conflicts:
	ChangeLog
 2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f Enhanced fix 2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Marcos García
97478ccbf2 Error statut image + not translated strings 2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171 Corrected some es_ES translations and fixed problems with translations not being translated 2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae Fixed bug #866: Standing order from an invoice suggests invoice total amount instead of remaining to pay 2013-05-01 20:40:29 +02:00
Laurent Destailleur
5b85adfb90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/account.php
 2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:28:14 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Marcos García
7a115a9216 Expedition class name was not being translated when creating invoice from it 2013-04-27 13:55:20 +02:00
fhenry
b67faf1eb1 Fix PgSQL 2013-04-26 13:01:42 +02:00
fhenry
b9f7d4c302 Fix bug on invoice extrafield type date 2013-04-26 12:20:15 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
simnandez
9dde709c3e Fix: typo errors 2013-04-25 13:01:38 +02:00
fhenry
bc7015a431 fix [ bug #850 ] Dolibarr PGSQL 2013-04-25 12:55:40 +02:00
Laurent Destailleur
3c5520f418 Fix: missing translation 2013-04-25 01:17:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
cd7f94d515 [ bug #849 ] BUG PGSQL 2013-04-24 23:19:01 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
23a7aae084 [ bug #841 ] Erreur compta/index 2013-04-23 14:48:34 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Laurent Destailleur
87ce23c4b8 Merge pull request #858 from marcosgdf/fix-notifications-alert-bug 
Notifications popup messages were not showing real notifications that we...
 2013-04-21 16:08:33 -07:00
Laurent Destailleur
9f3164d710 Merge pull request #849 from GPCsolutions/ca_report_improvments 
Improved reports
 2013-04-21 15:13:34 -07:00
Marcos García
5b248805c2 Notifications popup messages were not showing real notifications that were going to be sent 2013-04-21 14:24:19 +02:00
Raphaël Doursenaud
6cce2c0b10 Added forgotten file 2013-04-21 10:19:07 +02:00
Raphaël Doursenaud
50eb88db5d Fixed turnover by user 
Mistakingly used distinct in SQL request
 2013-04-21 10:11:19 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Laurent Destailleur
a4c23b1dcd Merge pull request #852 from marcosgdf/develop 
Refactor + es_ES translations improvement + minor stetic change
 2013-04-20 11:42:16 -07:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
fhenry
4202c8fc91 required once instead of require 2013-04-20 17:56:39 +02:00
fhenry
cae761d522 [ task #640 ] Better deposit invoice management 2013-04-20 17:10:03 +02:00
fhenry
61b78666a2 Change-Id: I07221687a67be28376ee9146eaa46567486300ce 2013-04-20 13:29:40 +02:00
fhenry
dd8a84bce3 Fix [ bug #833 ] Accounting journals are broken 2013-04-20 13:08:06 +02:00
Marcos García
1e00ccd07d Purchases and sellsjournal used tabs in their copyright comment. Restored 'em 2013-04-20 12:59:34 +02:00
Marcos García
c3c57351d0 Updated copyright 2013-04-20 12:57:50 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports 
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
 2013-04-20 07:33:10 +02:00
fhenry
880659af3a Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-04-20 02:49:16 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
fhenry
a3c5bef381 Fix bug FactureLine update for PgSQL 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/41317-impossible-de-modifier-une-ligne-de-facture#41422
 2013-04-19 15:12:02 +02:00
Regis Houssin
45300ccdd8 Fix: no result with a number with a comma 2013-04-19 09:55:22 +02:00
Regis Houssin
3e9a8677c6 Fix: no result with a number with a comma 2013-04-19 09:48:55 +02:00
fhenry
738ed467b3 Fix bug on update invoice line in PgSQL 2013-04-19 07:54:55 +02:00
Maxime Kohlhaas
1381373c95 Fix : set emetteur to MYCOMPANY when payment is a customer 2013-04-18 09:24:29 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
Regis Houssin
5c50b1db57 Fix: use empty instead isset 2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c Fix: use empty instead isset 2013-04-17 10:41:54 +02:00