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
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
ead6b4bf95 Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1830

Conflicts:
	ChangeLog
 2015-02-18 22:50:12 +01:00
Laurent Destailleur
89b9364837 Merge pull request #2337 from marcosgdf/bug-1822 
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
 2015-02-18 22:23:07 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
6531a5c6c7 Fix: [ bug #1830 ] Salaries payment only allows checking accounts 2015-02-10 09:44:27 +01:00
Marcos García de La Fuente
d9ac21ab82 Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL 2015-02-08 16:54:41 +01:00
Maxime Kohlhaas
db9d727eb8 FIX : Link to user was wrong on bank transaction card 2015-02-08 12:36:55 +01:00
Laurent Destailleur
24ad1afdd2 Merge pull request #2335 from atm-alexis/3.7 
FIX empty discount where created if amount is null
 2015-02-08 00:07:48 +01:00
Alexis Algoud
0ca6661e69 FIX empty discount where created if amount is null for a line with a different tva 2015-02-07 23:42:35 +01:00
aspangaro
f23212eb22 Center title column & modify language key 2015-02-07 14:55:56 +01:00
aspangaro
ace524056e Same problem 2015-02-07 14:34:04 +01:00
aspangaro
ba78b4c5e9 FIXED Missing language file 2015-02-07 14:18:02 +01:00
Marcos García de La Fuente
ef35483494 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 12:58:54 +01:00
Laurent Destailleur
0ea4a5db7d Fixed: Error management on triggers 2015-01-31 00:08:45 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
Frédéric FRANCE
69bb4b7b0b Use account defined in invoice for pdf doc 2015-01-18 23:00:26 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Laurent Destailleur
ff65035aee Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1717

Conflicts:
	ChangeLog
 2015-01-18 15:12:00 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Marcos García de La Fuente
003aa5ee44 Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount 2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38 
Update facture.php
 2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
BENKE Charles
2957c1445e Update facture.php 
$soc already filled upper if $socid filled
 2014-12-28 12:34:21 +01:00
BENKE Charles
191d4467e3 Update facture.php 
$soc already filled upper when $socid send
 2014-12-28 12:31:27 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
aa618d481b Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors 2014-12-23 13:07:16 +01:00
Laurent Destailleur
bdb47921e7 Fixed: Bad value for % increase for first year. 2014-12-21 14:15:36 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Frédéric FRANCE
650d4a3da9 Fix missing /form 2014-12-02 19:55:10 +01:00
Laurent Destailleur
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
Frédéric FRANCE
fbdd851875 Fix remove </a> not needed 2014-11-25 18:54:56 +01:00
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