lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

4659 Commits

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

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

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

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
 2013-04-16 11:37:51 +02:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Regis Houssin
7177e59ea4 Fix: missing quote 2013-04-15 21:41:34 +02:00
Regis Houssin
5682e0ae25 Fix: missing quote 2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f Fix: missing current entity record 2013-04-15 21:29:49 +02:00
Regis Houssin
21056d2b78 Fix: missing current entity record 2013-04-15 21:27:01 +02:00
Laurent Destailleur
b7edb3f472 Fix: Correct css 2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
fhenry
882560dad7 Fix [ bug #821 ] 'f.facnumber' in accountancy 2013-04-15 14:34:32 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
67052933ca Fix: PHPUnit 2013-04-14 23:42:24 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Marcos García
486425d258 Merge branch '3.3' into bug-817 
Conflicts:
	ChangeLog
 2013-04-13 23:58:05 +02:00
Laurent Destailleur
7e48e341ad Merge pull request #829 from marcosgdf/translations 
Added missing translation
 2013-04-13 14:23:07 -07:00
Marcos García
7c4b901b0a Improved es_ES translations and replaced missing translation 2013-04-13 17:45:41 +02:00
Marcos García
a6ed2551fb Revert "Replaced Rest not translated string with AlreadyPaid" 
This reverts commit 580881c205.
 2013-04-13 17:13:59 +02:00
Marcos García
580881c205 Replaced Rest not translated string with AlreadyPaid 2013-04-13 17:12:16 +02:00
Marcos García
b3a035951f [ bug #817 ] Purchases journal does not reflect localtaxes 2013-04-13 15:22:59 +02:00
Marcos García
d6b42ac879 [ bug #816 ] Sales journal does not reflect localtaxes 2013-04-13 14:44:56 +02:00
Laurent Destailleur
62893c2ae4 Qual: uniformize code to use function de set with and height for graphs 2013-04-12 17:08:54 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Marcos García
9ec74194a0 Translated linked object propal module name 2013-04-11 23:10:27 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
Laurent Destailleur
8e2171b64c Fix: Error management and missing transactions check 2013-04-07 16:39:20 +02:00
Laurent Destailleur
59dfab9d21 Fix: regresson after rename of fields 2013-04-07 15:43:21 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop 
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
 2013-04-05 13:39:52 -07:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop 
Develop
 2013-04-05 13:28:58 -07:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
 2013-04-05 11:46:09 +02:00
Laurent Destailleur
d8a86453e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136 Optimize size of graph 2013-04-04 21:13:51 +02:00
Maxime Kohlhaas
e5085b2a1c Fix : filter on payment type was not working (int instead of char) 2013-04-04 20:19:42 +02:00
Laurent Destailleur
607ebbfe8b Qual: Replace tab with div 2013-04-04 19:42:21 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
Laurent Destailleur
3590ae8eaa Merge pull request #794 from grandoc/develop 
fix: some issue on the road to numbering supplier invoice
 2013-04-02 07:07:57 -07:00
Régis Houssin
e139e63d92 Fix: missing $soc object with origin object 2013-04-02 12:01:39 +02:00
Grand Philippe
20fb7f79c0 fix: some issue on the road to numbering supplier invoice 2013-04-01 22:58:54 +02:00
Laurent Destailleur
954af0f6c7 New: Add option INVOICE_CAN_NEVER_BE_REMOVED 2013-04-01 22:17:51 +02:00
Laurent Destailleur
80e34c8e1c New: Add option INVOICE_CAN_NEVER_BE_REMOVED 2013-04-01 22:16:55 +02:00
Laurent Destailleur
eaff41c65f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-01 21:01:44 +02:00
Laurent Destailleur
cf4603f5af Merge pull request #793 from jfefe/extrafields 
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
 2013-04-01 12:00:08 -07:00
Laurent Destailleur
7d32db73c6 Fix: Restore lost commit. 2013-04-01 20:59:51 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8 Uniformize usage of extrafields methods 2013-04-01 19:43:26 +02:00
Grand Philippe
e2623c6ad5 try to fix :supplier invoice numbering 2013-04-01 16:04:15 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01:00
jfefe
e99ba51f1d Use of new function to set optionals from add / update form 
Format date display for data from JS calendar (date type extrafield)
 2013-03-30 10:46:23 +01:00
Regis Houssin
1e3b26a104 Fix: file with a specific mask not found, again 2013-03-29 11:54:22 +01:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00
simnandez
26d2e3d928 Fix: [ bug #777 ] Withdrawal receipt set Credited 2013-03-26 15:48:12 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Sébastien de Chateauvieux
148ad65150 TVA NPR : deduplicate line. Remove tva npr from journal lines 2013-03-26 08:11:06 +04:00
Laurent Destailleur
75c15ee9a1 New: Revenue stamps works for invoices 2013-03-25 13:04:03 +01:00
Laurent Destailleur
4b1c9c1a0d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-25 12:29:30 +01:00
Laurent Destailleur
dc0c1a2c85 Fix: [ bug #729 ] incorrect unpaid invoice list 2013-03-25 12:20:24 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
fe7cad8d6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65 Use combo list for revenue stamp 2013-03-24 00:35:40 +01:00
fhenry
d84cd86a50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Merge Cron module
 2013-03-23 20:24:28 +01:00
Grand Philippe
2c718b740e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-23 19:09:08 +01:00
Grand Philippe
7f61061805 fix : wrong URL 2013-03-23 19:08:02 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a Fix: List of customers to build invoice or order 2013-03-23 12:33:25 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Grand Philippe
e506601214 display enhancement and standardize 2013-03-22 10:48:14 +01:00
Laurent Destailleur
4949d74267 New: Add a tab "consumption" on thirdparties to list products 
bought/sells.
(i implement list for customer invoices and supplier orders, need
someone to finish work for customer orders and supplier invoices)
 2013-03-22 00:02:25 +01:00
Laurent Destailleur
a2763df9e7 Qual: Start to clean the simple accountancy moule. 2013-03-20 21:41:16 +01:00
Laurent Destailleur
2da3fb68a0 Merge pull request #751 from jfefe/extrasep 
New type of extrafield : separator
 2013-03-16 07:41:34 -07:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
jfefe
f16c9dd3ac Fix : bad permission 2013-03-16 00:19:53 +01:00
jfefe
f1a05528ad Show extrafield separator on invoice 2013-03-16 00:16:30 +01:00
Laurent Destailleur
a86c6ac39d New: price function can show price with currency symbol. 2013-03-15 15:59:51 +01:00
Laurent Destailleur
fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/webservices/server_user.php
 2013-03-12 14:55:13 +01:00
simnandez
5c4b537a65 Fix: [ bug #762 ] Bad profit calculation in Reporting 2013-03-12 11:49:15 +01:00
frederic34
9c8a9ff7dc Print IPP 2013-03-11 23:35:31 +01:00
Laurent Destailleur
e1bf659db5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-11 16:49:37 +01:00
Laurent Destailleur
b0d7b33815 Merge pull request #715 from jfefe/extrafields 
[ task #746 ] add extrafields support on propal object
 2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
b4299ad583 Fix: Select of user 2013-03-11 14:51:19 +01:00
Laurent Destailleur
d8af59756d New: Add function dolGetFirstLastname 2013-03-11 10:11:43 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
0fe91796ef New: [ task #696 ] Remove "new stdClass();" when possible 2013-03-08 15:52:23 +01:00
Laurent Destailleur
710585d4c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-07 22:40:12 +01:00
Laurent Destailleur
6cac84b222 Fix: Some fixes into reconciliate page 2013-03-07 22:39:57 +01:00
Laurent Destailleur
f62045e770 Merge pull request #720 from simnandez/develop 
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
 2013-03-07 10:58:13 -08:00
Laurent Destailleur
b060e5961b Qual: Another step in men manager rewrite. 2013-03-07 19:47:03 +01:00
simnandez
0c8d3336c2 [ task #707 ] Create option ProfIdx are mandatory to validate a invoice 2013-03-07 18:41:56 +01:00
jfefe
dc1314f4f4 Retreive extrafield when fetch invoice 2013-03-06 05:31:19 +01:00
jfefe
3ccb0fb92c Edit extrafields on customer invoice 2013-03-06 04:54:08 +01:00
jfefe
7260e139df Add extrafields support when create a customer invoice 2013-03-06 04:17:14 +01:00
jfefe
4314d4c7fe Add admin screen for extrafields on customer invoices 2013-03-06 03:50:41 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
 2013-03-05 18:32:01 +01:00
fhenry
f793ed83f6 Fix [ bug #747 ] 2013-03-04 15:36:40 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
8d7654916f english language standardization 2013-02-23 15:46:12 +01:00
Grand Philippe
b699b79a15 english language standardization 2013-02-23 15:36:12 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Grand Philippe
9a431bb8e3 english standardization 2013-02-22 16:33:48 +01:00
Grand Philippe
890b9ca44a english standardization 2013-02-22 16:27:58 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
Grand Philippe
303577a7fa english standardization 2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
simnandez
4cb6072f03 New: [ task #707 ] Create option ProfIdx are mandatory to validate a 
invoice
 2013-02-21 11:03:14 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	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.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
9a951e4d6d Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9 Fix: When creating invoice from other object, type must be "standard". 2013-02-17 16:37:28 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Maxime Kohlhaas
1cfd32680a Fix : set some vars when invoice is back to draft status 2013-02-13 15:43:27 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
simnandez
ad3645f7f4 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-25 11:37:30 +01:00
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +01:00
Laurent Destailleur
9f44161e55 New: Can attach file for trip and expenses module 2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Regis Houssin
e8ce9cecf2 Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
simnandez
ffbb611eb4 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 22:08:52 +01:00
simnandez
96c5eacf4a [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 09:58:21 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Marcos García
be40114541 Fixed translation problems with Prelevement module 2013-01-09 21:33:55 +01:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371 Fix: empty value if combobox disabled 2013-01-09 10:40:36 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
ec664aaa71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-07 00:42:02 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Laurent Destailleur
0f5a80a40f Fix: Bad var name 2013-01-07 00:14:38 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
simnandez
b4204b9c25 Fix: Withdrawal payment warning 2013-01-04 20:54:15 +01:00
simnandez
68866eaa5f Fix: Withdrawal payment warning 2013-01-04 11:07:31 +01:00
Laurent Destailleur
4e27969317 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-02 22:15:58 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
18bfceafca Merge remote-tracking branch 'origin/3.3' into develop 2012-12-30 14:17:05 +01:00
Laurent Destailleur
a1b0fbcc2c Fix: [ bug #659 ] Comment in recurrent invoices is not stored 
Fix: Missing payment mode
 2012-12-30 14:14:52 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/bank/search.php
 2012-12-29 17:38:12 +01:00
Laurent Destailleur
a9e9b761cc Merge pull request #560 from FHenry/develop 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:33:17 -08:00
Laurent Destailleur
bc489773e8 Merge pull request #559 from FHenry/3.3 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:32:47 -08:00
Laurent Destailleur
caf4130fb7 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2 Fix: Missing field 2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
fhenry
5099bc5e89 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:06:11 +01:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Marcos García
316552f4ea Added missing translation and fixed references to incorrect variable 2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93 Fixed donation payment mode translation and another problem with donation edit form 2012-12-29 00:46:25 +01:00
Laurent Destailleur
f9700dc941 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:37:15 +01:00
simnandez
7cbcd1fc5d Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 17:00:29 +01:00
simnandez
488d482508 Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 16:57:53 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Maxime Kohlhaas
4cffe3e5a3 Fix : minor html fix + changelog 2012-12-07 11:06:51 +01:00
Grand Philippe
c6a3add952 fix : typo 2012-12-06 17:09:12 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
f58d0636a1 Doxygen 2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c Fix: Do not loose label 2012-11-18 16:41:10 +01:00
Laurent Destailleur
fe86b5d29e Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT 2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86 Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed 
forced var)
 2012-11-17 19:55:19 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Regis Houssin
b95ab2239f Fix: remove unused code 2012-11-12 09:43:12 +01:00
Laurent Destailleur
f9dec36d7a Fix: Regression 2012-11-11 15:44:02 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00
Laurent Destailleur
ba56e679bd Fix: Calculation of default date for payment term was not using 
function.
 2012-11-05 17:21:05 +01:00
Laurent Destailleur
135a622076 Fix: Bad parameter 2012-11-03 15:35:11 +01:00
Laurent Destailleur
df7bedf955 Fix: [ bug #592 ] stock sold value is wrong 2012-11-03 12:12:24 +01:00
Laurent Destailleur
7fd16c3a7e Qual: Error management 2012-11-03 11:54:32 +01:00
Laurent Destailleur
118733c600 Fix: Error message type 2012-11-03 11:26:45 +01:00
Laurent Destailleur
375f464553 Fix: Option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was not used into 
journals.
 2012-11-03 04:29:38 +01:00
Laurent Destailleur
79e3b4d792 Fix: Missing br 2012-11-03 04:02:48 +01:00
Laurent Destailleur
8709933288 Fix: Too much sanitizing 2012-11-03 00:47:09 +01:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac New: English bank account need a bank code (called sort code) to 
identify an account.
 2012-10-31 00:22:13 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page 
Fix: bad field name
 2012-10-28 02:14:08 +02:00