lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,633 Commits 43 Branches 150 Tags 886 MiB
2e81fa342e
Commit Graph

4352 Commits

Author SHA1 Message Date
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
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
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
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