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
6d2e024d52 Doxygen 2014-11-23 17:53:44 +01:00
Laurent Destailleur
3f655154c5 Merge pull request #2083 from frederic34/patch-2 
Fix Typo
 2014-11-23 17:47:43 +01:00
Frédéric FRANCE
979d6dffa2 Update /compta/paiement/cheque/list.php 2014-11-23 17:45:18 +01:00
Frédéric FRANCE
339415034e Update /compta/facture/impayees.php 2014-11-23 17:44:45 +01:00
Frédéric FRANCE
ccff0f0952 Update /compta/facture/list.php 2014-11-23 17:44:41 +01:00
Frédéric FRANCE
9b731753e7 Update /compta/salaries/index.php 2014-11-23 17:44:37 +01:00
Frédéric FRANCE
fa89e310ae Update /compta/paiement/list.php 2014-11-23 17:44:33 +01:00
Frédéric FRANCE
dd1c39b44e Update /compta/bank/search.php 2014-11-23 17:44:29 +01:00
Frédéric FRANCE
2a79c2c826 Update /compta/sociales/index.php 2014-11-23 17:44:25 +01:00
Frédéric FRANCE
59494db8c1 Update /compta/tva/reglement.php 2014-11-23 17:44:21 +01:00
Frédéric FRANCE
8c839cc2a1 Update /compta/prelevement/list.php 2014-11-23 17:44:16 +01:00
Frédéric FRANCE
68ccb33def Update /compta/deplacement/list.php 2014-11-23 17:44:13 +01:00
Frédéric FRANCE
045c2f9568 Update /compta/dons/list.php 2014-11-23 17:44:08 +01:00
Frédéric FRANCE
326e009cad Fix Typo 2014-11-23 17:42:06 +01:00
Laurent Destailleur
652b0f84a7 Fixed: Field is used only by module accounting so must have a condition 
on it.
 2014-11-23 17:03:22 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
 2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
eaa4b6cb56 Add PR manually because of conflict "#1678 & #1677 Untranslatable token" 2014-11-22 15:37:18 +01:00
Laurent Destailleur
d6f47227fe Fixed: [ bug #1646 ] Can't list unpaid invoices 2014-11-22 15:09:54 +01:00
Laurent Destailleur
5acdce0b9f Fixed: [ bug #1647 ] Can't list tax payments 2014-11-21 23:52:12 +01:00
Laurent Destailleur
ce98036725 Fixed: [ bug #1648 ] Can't see turnover report by product/services 2014-11-21 23:45:56 +01:00
Laurent Destailleur
80e62697f0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/bank/treso.php
 2014-11-18 19:01:01 +01:00
Laurent Destailleur
01279edfc8 Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank 
planned transactions.
 2014-11-16 16:36:32 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined. 
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
 2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Christophe Battarel
7ed496d7d9 FIX: copy extrafields when creating order from propale and creating 
invoice from order
 2014-11-12 17:51:26 +01:00
Laurent Destailleur
29298c73b9 Fix: Must show limit into list 2014-11-09 19:16:22 +01:00
Laurent Destailleur
6fd89c4b41 Fix: Missing translation 2014-11-08 20:05:56 +01:00
Laurent Destailleur
6762b98c00 Minor look enhancement during debug 2014-11-07 23:25:39 +01:00
Drosis Nikos
24439eb1a3 Fix : tva not coming from multiprice 2014-11-07 15:31:06 +02:00
aspangaro
16126891a6 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-06 06:41:09 +01:00
aspangaro
89296e3011 Typo search list 2014-11-05 22:27:26 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Laurent Destailleur
90fb05805c Fix: Missing translation 2014-11-05 16:21:17 +01:00
Laurent Destailleur
26bd214e72 Merge pull request #1996 from aspangaro/develop-search 
Increase list search
 2014-11-04 17:40:11 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached 
to user.
 2014-11-04 13:54:18 +01:00
aspangaro
39e83576a2 prelevement list 2014-11-02 21:44:03 +01:00
aspangaro
5bf5b9b16f Trips list 2014-11-02 21:12:40 +01:00
aspangaro
10ed271e38 Search bank transactions 2014-11-02 20:18:46 +01:00
aspangaro
1dcb7a58f3 Presentation & fix SQL injection 2014-11-02 14:51:21 +01:00
aspangaro
ff68c685c0 Customers payments list 2014-11-02 14:41:19 +01:00
aspangaro
6109529c6c vat payments list & typo on css class 2014-11-02 14:19:28 +01:00
aspangaro
d6a42bda95 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-02 13:55:57 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
aspangaro
26c63f3ea4 donation list 2014-11-01 15:06:46 +01:00
aspangaro
5122b32ccc Salaries list 2014-11-01 14:59:39 +01:00
aspangaro
a0d3dbd93c Social Contrib list 2014-11-01 14:52:05 +01:00
aspangaro
9e07c3a7b6 Typo 2014-11-01 14:51:52 +01:00
aspangaro
abfa1a5fde cheque list 2014-11-01 14:28:28 +01:00
Laurent Destailleur
2dc1cb7c27 Fix: Use correct permission on correct field. 2014-10-30 12:19:38 +01:00
Laurent Destailleur
47c2dc4fcf Fix: Can see only trip allowed. 2014-10-30 11:36:04 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
4d515d660c New: Feature to link manually an order to an invoice does not disappear 
once link has been done.
 2014-10-24 14:17:36 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into 
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
 2014-10-18 15:38:49 +02:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
68179c8794 Always editable option for extrafields on invoice and order 2014-10-14 16:13:17 +02:00
Laurent Destailleur
536b579b35 Clean code 2014-10-14 00:27:23 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
968b021985 Fix trad and sql error 2014-10-05 05:37:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Regis Houssin
2425fdfadd FIXME $socid is not defined (strict mode) 2014-10-02 08:44:49 +02:00
Maxime Kohlhaas
920c9c7251 Fix : tva not coming from multiprice 2014-09-30 17:36:01 +02:00
Laurent Destailleur
bbf07641ed Fix: checkstyle 2014-09-29 20:39:19 +02:00
Drosis Nikos
8c6ce79d9d Fix Lang for Payment Type 2014-09-29 18:15:09 +03:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Laurent Destailleur
c6fc07e412 Merge pull request #1926 from fmarcet/3.6 
Fix: Withdrawal total amount is double
 2014-09-29 15:41:59 +02:00
Laurent Destailleur
ba33f73767 Merge pull request #1925 from tiaris/develop 
adding hooks for supplier card and order card
 2014-09-29 15:40:31 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
jean
16facc81aa Add link with order when invoice made for a shioppoing 2014-09-26 10:11:38 +02:00
fmarcet
7b9f154c29 Fix: Withdrawal total amount is double 2014-09-25 12:45:08 +02:00
Christophe Battarel
d1868b643e FIX: clone line extrafields value on quote, order and invoice 2014-09-24 11:47:34 +02:00
Laurent Destailleur
d6385fe1cc Merge pull request #1917 from atm-alexis/feature_add_clone_to_social_contribution 
add the clone action for a social contribution
 2014-09-24 01:16:27 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Alexis Algoud
691658cde3 add the clone action for a social contribution 
- With option to clone it to the next month by default
 2014-09-23 16:52:15 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
bd6afa10ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-22 23:57:46 +02:00
Laurent Destailleur
4ff6b1ab1a Merge branch 'KreizIT-predefined' into develop 
Conflicts:
	ChangeLog
 2014-09-22 23:57:12 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
Florian HENRY
565de5258f Re-Add subtotal line on compta report (accidentaly remove before) 2014-09-20 09:19:26 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-20 06:36:31 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
13abff1ed7 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-09-18 17:53:41 +02:00
Laurent Destailleur
2b69358c9c Merge pull request #1896 from FHenry/develop 
Add Dunning into accountancy report
 2014-09-18 17:48:40 +02:00
Laurent Destailleur
46f117b0f9 Merge pull request #1902 from atm-maxime/mko_workonlists 
Work on lists
 2014-09-18 17:29:15 +02:00
Laurent Destailleur
65a69d3019 Fix: Bad field 2014-09-18 16:50:16 +02:00
Juanjo Menent
90edd96646 Fix: Invoices payments may be older than invoices 2014-09-18 10:11:39 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Maxime Kohlhaas
3611ac673f Add clear search icon on invoices list 2014-09-17 17:58:11 +02:00
Maxime Kohlhaas
9cc01635aa Add clear search icon on unpaid invoices list 2014-09-17 17:56:53 +02:00
Florian HENRY
15d680ea4b bad mege 2014-09-16 21:19:52 +02:00
Florian HENRY
fc65421b2e bad merge 2014-09-16 21:19:07 +02:00
Florian HENRY
32c777a78b Fix bad merge 2014-09-16 21:17:22 +02:00
Florian HENRY
bb612d24db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php
 2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
aspangaro
e1a40bd8bd Merge remote-tracking branch 'Upstream/develop' into develop-cheque 2014-09-16 07:23:55 +02:00
aspangaro
0f3db1e912 Add more search field in list of cheque deposits 2014-09-16 07:21:29 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
2dbbc76645 Fix: Trigger error not reported 2014-09-15 11:48:50 +02:00
Laurent Destailleur
c4facf20e6 Merge branch 'bug-1546' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1546

Conflicts:
	ChangeLog
 2014-09-14 21:39:25 +02:00
Marcos García de La Fuente
7bac9444e6 [ bug #1546 ] Incorrect page number when searching in the list of bank transactions 2014-09-14 14:32:17 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
2cfe088ee4 Better organization of accountancy menus 
Fix: sql error with pgsql
 2014-09-13 16:54:17 +02:00
Cedric
86d8870939 Add create button on predefined invoice details 
Check invoice creation right
 2014-09-11 17:33:47 +02:00
Laurent Destailleur
562c47dd62 Fix: colspan too low. 2014-09-08 12:00:25 +02:00
Laurent Destailleur
0cefe5af43 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/date.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/includes/tcpdf/include/tcpdf_static.php
	htdocs/product/price.php
 2014-09-07 13:18:56 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
bc7d839c64 Fix: Missing status "refunded". 
Fix: translation
 2014-09-06 17:16:24 +02:00
Laurent Destailleur
996977a4a8 Fix: Missing user name 2014-09-06 17:10:52 +02:00
Laurent Destailleur
91a894f459 Fix: Missing user name 2014-09-06 17:10:22 +02:00
Laurent Destailleur
522b5a91bc Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:16:24 +02:00
aspangaro
f054d624cd Merge branch 'Upstream/3.6' 2014-09-05 20:59:44 +02:00
Juanjo Menent
6c7d2cdd12 Merge pull request #1868 from aspangaro/develop-patch3 
Bank card presentation on edit & create
 2014-09-05 09:41:15 +02:00
Juanjo Menent
ffc730d82f Merge pull request #1867 from aspangaro/develop-patch1 
Payment VAT & Salaries :: Add controls on field required
 2014-09-05 09:08:28 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines 
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
 2014-09-04 19:03:48 +02:00
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