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
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Laurent Destailleur
da8a1cb475 Fix: Iban was used instead of Bic into SEPA file. 
Fix: Must unaccent strings into SEPA file.
 2014-09-04 15:38:20 +02:00
Laurent Destailleur
395209a5db Fix: Reason to have button greyed is wrong 
Conflicts:
	htdocs/compta/facture/prelevement.php
 2014-09-04 15:17:05 +02:00
Laurent Destailleur
4333e96ecb Fix: Reason to have button greyed is wrong 2014-09-04 15:14:30 +02:00
aspangaro
fa6941efc6 Merge branch 'Upstream/develop' 2014-09-04 04:23:19 +02:00
aspangaro
2cba7ab9e6 Card presentation 2014-09-04 04:22:43 +02:00
aspangaro
291d70fa9d Payment Salaries :: Add field required & control on it 2014-09-03 21:48:15 +02:00
aspangaro
058cf8782c Payment VAT :: Add control on field required 2014-09-03 21:47:46 +02:00
aspangaro
4e05afdd66 Payment Salaries :: Add field required & control on it 2014-09-03 21:32:31 +02:00
aspangaro
bd99f3943d Payment VAT :: Add control on field required 2014-09-03 21:31:40 +02:00
Laurent Destailleur
1eaf615426 Fix: no br after title 2014-09-03 14:32:59 +02:00
Laurent Destailleur
38233ca05d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/limits.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/core/ajax/ziptown.php
 2014-09-02 13:46:47 +02:00
Laurent Destailleur
17dec4b924 Fix: Bad merge 2014-09-02 13:05:03 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Juanjo Menent
328b8b9643 Fix: Salary payments are not reflected on the reporting sheets 
Conflicts:
	ChangeLog
 2014-08-28 15:29:31 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Laurent Destailleur
d3a3e8786e Fix: sql request with pgsql 2014-08-28 15:08:24 +02:00
Laurent Destailleur
3e2ed270e1 Fix: sql request with pgsql 2014-08-28 15:07:33 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
Laurent Destailleur
86d91ff698 Fix: Setting new property of object must be done only after all database 
actions are ok (and if ok).
 2014-08-19 15:03:55 +02:00
Maxime Kohlhaas
e760201a59 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-14 14:26:01 +02:00
Maxime Kohlhaas
c6637207f8 Fix : VAT and NPR rates where coming from multiprice... 2014-08-14 14:25:41 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Laurent Destailleur
d6c4993c40 Merge pull request #1822 from Devensys/Devlop-PayTotalButton 
Add button to fill amount paiement
 2014-08-14 01:28:20 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-14 00:59:48 +02:00
Laurent Destailleur
abb845b579 Merge pull request #1813 from atm-maxime/mkoevols 
Add payment mode in invoice list
 2014-08-14 00:21:34 +02:00
Laurent Destailleur
351705b76b Merge pull request #1812 from atm-maxime/mkoshipment 
New : After commit b7ee10a074 don't add pr...
 2014-08-14 00:20:31 +02:00
Laurent Destailleur
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into 
KreizIT-task712

Conflicts:
	ChangeLog
 2014-08-14 00:18:51 +02:00
Florian HENRY
eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-12 12:37:31 +02:00
Andrelec1
49d1983acd trigger on total 
Add hook on js for total
 2014-08-12 11:40:24 +02:00
Andrelec1
1ce4996a34 finish implement 
remove old code and add new one ...
 2014-08-12 11:34:53 +02:00
Maxime Kohlhaas
c207daa18c Revert invoice list 2014-08-11 10:07:09 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
75eb9cadc7 Merge pull request #1809 from KreizIT/fix_1549 
Fix :  [ bug #1549 ] It's not possible add ExtraFields
 2014-08-08 01:52:13 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
KreizIT
973d61fe13 [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice 2014-08-07 16:23:02 +02:00
Laurent Destailleur
de76fe4951 Fix: Missing join into request. 
Conflicts:
	htdocs/compta/facture.php
 2014-08-07 15:05:31 +02:00
Laurent Destailleur
1239e713c9 Fix: Missing join into request. 2014-08-07 15:00:10 +02:00
Laurent Destailleur
80653409a2 Fix: Missing join into request. 2014-08-07 14:57:08 +02:00
Maxime Kohlhaas
7deacdf851 New : After commit b7ee10a074 don't add product with qty 0 in invoices 2014-08-07 14:07:44 +02:00
Maxime Kohlhaas
885c26f27b Ajout du mode de règlement dans la liste des factures et dans la liste des impayées 2014-08-07 13:50:25 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Laurent Destailleur
1751b58ef8 New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or 
content template.
 2014-08-06 00:46:00 +02:00
Laurent Destailleur
164c9e0b75 New: Can defined a bcc for each email type. 2014-08-05 09:28:58 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
4e8ec8e598 Revert "Add Reduction value in pdf" 
This reverts commit 0b5707c1cf.
 2014-08-04 18:36:18 +02:00
Laurent Destailleur
50f18ff939 Merge pull request #1801 from fmarcet/develop 
Fix: Optimize Price by Customer
 2014-08-04 09:12:35 +02:00
Laurent Destailleur
8d867dde69 Merge pull request #1797 from Devensys/Develop-AddValueReduction 
Add Reduction value in pdf
 2014-08-04 09:01:45 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Laurent Destailleur
605919be76 Fix: Too many parameter 
Fix: Can't delete bank account
 2014-08-01 14:51:40 +02:00
Andrelec1
0b5707c1cf Add Reduction value in pdf 
Add value of %reduction in pdf
 2014-08-01 14:49:42 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
1c97b3f779 Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode 2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
aspangaro
dcb507fd37 Presentation invoice page 2014-07-29 06:55:28 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Léonard
0228cd9db7 Fix translations in e-mail forms 2014-07-28 02:45:58 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
frederic34
f08f4d7c5e Update facture.php 
Remove a space
 2014-07-21 09:18:14 +02:00
Florian HENRY
cf63f1a40d Remane contract ref_ext to ref_supplier 2014-07-21 08:36:59 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
nicoplh
2cfc5f10a8 Update impayees.php 
remove useless type alpha.
 2014-07-18 14:47:23 +02:00
nicoplh
25a591bd03 Update impayees.php 
Add column ref.Client with search module.
 2014-07-17 16:21:23 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Juanjo Menent
893240ce21 Qual: Uniformize code. Errors 2014-07-12 09:48:10 +02:00
KreizIT
b6edde320b Conflict solved 2014-07-12 09:20:00 +02:00
KreizIT
971ae8ae59 Refactor: TVA_* trigger 2014-07-11 15:01:51 +02:00
Laurent Destailleur
728ca22183 Merge pull request #1730 from GPCsolutions/accessibility 
Accessibility
 2014-07-11 14:57:02 +02:00
KreizIT
a7afb5bdae Refactor: PAIEMENT_SALARY_* trigger 2014-07-11 14:54:32 +02:00
KreizIT
c1a004106d Refactor: LOCALTAXE_* trigger 2014-07-11 14:47:44 +02:00
KreizIT
fc61cc9bfa Refactor: BILL_* and LINEBILL_* trigger 2014-07-11 14:36:13 +02:00
Raphaël Doursenaud
f6848e8655 Add label on search boxes 2014-07-11 13:26:02 +02:00
Laurent Destailleur
5e75dd27e8 Merge pull request #1719 from frederic34/selectbank 
Select bank account for propal order and invoice
 2014-07-11 12:29:21 +02:00
Laurent Destailleur
5c81074483 Merge pull request #1709 from KreizIT/review_trig2 
Review trig2
 2014-07-11 12:27:43 +02:00
frederic34
742bdcb715 Set bank account for supplier invoices 2014-07-09 18:44:20 +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
frederic34
865fea37e9 Correct filter 2014-07-08 16:02:46 +02:00
frederic34
a2911cef11 Filter on invoice for "treso" 2014-07-08 11:46:22 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
frederic34
0cb5220d4d Use english for the function name 2014-07-07 20:54:41 +02:00
frederic34
8e612b532a Use & instead & 2014-07-07 18:44:08 +02:00
frederic34
83d3af9bf8 Select account for payment 2014-07-07 18:25:20 +02:00
frederic34
516632e41d Select bank account for customer order 2014-07-07 17:59:04 +02:00
Juanjo Menent
74b42f6cb4 [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:31:34 +02:00
Juanjo Menent
65d303999f [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:26:21 +02:00
Juanjo Menent
8e4e08f907 [ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu 2014-07-04 16:48:42 +02:00
KreizIT
c70bdabeda Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action 2014-07-04 16:23:10 +02:00
Juanjo Menent
4063260cc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 16:16:52 +02:00
Juanjo Menent
fdb938af0f [ task #1063 ] Allow edit localtaxes rate for thirds. Remove country 
condition
 2014-07-04 13:44:26 +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
Laurent Destailleur
8c306a968f Merge pull request #1704 from KreizIT/review_trig 
Review user trigger
 2014-07-04 13:20:32 +02:00
Juanjo Menent
747b6a9f94 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports 
and payments
 2014-07-04 12:50:55 +02:00
Juanjo Menent
416577a6aa [ task #1063 ] Allow edit localtaxes rate for thirds. Works with 
invoices
 2014-07-04 11:41:43 +02:00
KreizIT
023e7ce8ce FIX : [ bug #1502 ] DON_CREATE trigger does not intercept trigger action 
- Add DON_CREATE in interface_90_all
- Add new trigger DON_UPDATE, DON_DELETE
 2014-07-03 16:04:12 +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
b985dc3342 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/install/mysql/tables/llx_bank_account.sql
 2014-06-30 00:42:17 +02:00
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
e2472351c3 Merge branch 'fix1487' of github.com:KreizIT/dolibarr into 
KreizIT-fix1487

Conflicts:
	ChangeLog
 2014-06-29 23:42:38 +02:00
aspangaro
5cc8ec4f5f Add accountancy code journal into bank card & modify presentation 2014-06-29 20:10:43 +02:00
Florian HENRY
e8bb5d5cc0 Syntax 2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234 Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if 
not defined for customer
 2014-06-29 17:39:54 +02:00
Laurent Destailleur
bb2e843fc9 More visible information on predefined invoices. 2014-06-29 14:03:14 +02:00
Laurent Destailleur
198a8d40f7 Fix: Missing translation 2014-06-29 13:53:07 +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
KreizIT
a153480bc6 Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action 
Change trigger call to new function call_trigger
 2014-06-27 13:48:23 +02:00
Juanjo Menent
773caf808e [ task #867 ] Remove ESAEB external module code from core 2014-06-27 09:09:54 +02:00
Juanjo Menent
6ce1ef08cf [ task #867 ] Remove ESAEB external module code from core 2014-06-27 09:09:08 +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
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +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
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
Laurent Destailleur
39eea995a4 Merge pull request #1675 from FHenry/3.5 
Fix == instaed of = in variable affectation
 2014-06-20 16:52:44 +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
Florian HENRY
d09ccf5855 Fix == instaed of = in variable affectation 2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Maxime Kohlhaas
bd21a559da Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-06-20 09:06:36 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +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
aspangaro
516363f491 Bank - Enhance readability 2014-06-17 06:43:50 +02:00
Laurent Destailleur
4c0fe98ae2 Merge pull request #1665 from atm-maxime/develop 
Fix 1480, 1483, 1497 $this instead of $object
 2014-06-14 14:13:10 +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
Maxime Kohlhaas
d0a417ad36 Fix 1480, 1483, 1497 $this instead of $object 2014-06-14 11:37:57 +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
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
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
frederic34
88c5d6e5d1 Display the total with currency 2014-06-11 18:01:14 +02:00
frederic34
89547dde37 Display the total by currency account 2014-06-11 17:42:03 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Marcos García de La Fuente
9344123887 CR Fix 2014-06-09 15:25:31 +02:00
fmarcet
66606b42ca Fix: Serious bug on withdrawal 2014-06-06 17:06:30 +02:00
Laurent Destailleur
e5bd170114 Add comment 2014-05-30 11:21:24 +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
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
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