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
