lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,719 Commits 43 Branches 150 Tags 886 MiB
4f2ff1642b
Commit Graph

35719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grand Philippe
4f2ff1642b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-19 15:24:13 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Grand Philippe
d541bc874d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-19 08:37:34 +01:00
Grand Philippe
fb75358c10 fix: deprecated for expedition_methode_id 2013-03-18 17:34:29 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
fhenry
9e46a55bbf Taking account remark on pull request 2013-03-17 22:26:06 +01:00
Laurent Destailleur
c6b4259735 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Laurent Destailleur
d0449768f7 Use div instead of table 2013-03-17 19:31:13 +01:00
Laurent Destailleur
c4b86bd9dc Merge pull request #755 from grandoc/develop 
normalize
 2013-03-17 10:00:07 -07:00
Grand Philippe
294b4865d1 normalize and simplify code 2013-03-17 16:10:43 +01:00
Grand Philippe
29b8ce1c2d try to fix: supplier invoice numbering 2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9 normalize 2013-03-17 14:40:49 +01:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
Laurent Destailleur
ca96bd6467 Merge pull request #753 from grandoc/develop 
try to fix : cannot display numbering models
 2013-03-17 05:05:28 -07:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
c44e9d6044 normalize and simplify code 2013-03-17 11:00:38 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-17 10:03:29 +01:00
Laurent Destailleur
d4f5ac8754 Fix: regression after rename of field 2013-03-16 18:02:32 +01:00
Grand Philippe
8931a19b7e try to fix : cannot display numbering models 2013-03-16 17:25:39 +01:00
Grand Philippe
d2c10159fe try to fix : cannot display numbering models 2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
fhenry
07bc0cd09e Taking account remark 
1f5ebb594a
 2013-03-16 17:01:17 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +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
ca0d3be33b Merge pull request #750 from grandoc/develop 
Develop
 2013-03-16 07:40:05 -07:00
Laurent Destailleur
d590aa56eb Merge pull request #749 from simnandez/3.3 
Fix: Bad orders list viewstatut filter if expeditons module is disabled
 2013-03-16 07:39:31 -07:00
Laurent Destailleur
fcef334122 Merge pull request #748 from GPCsolutions/naturalsearch 
Natural search
 2013-03-16 07:38:55 -07:00
Grand Philippe
dc7a57b3f7 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 15:26:19 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Laurent Destailleur
5ad1cbbfa5 Fix: Filter lost during navigation 2013-03-16 15:04:27 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
eldy
de458fa626 Qual: Move option at better place 2013-03-16 12:22:37 +01:00
Grand Philippe
cdb521663e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 10:35:12 +01:00
fhenry
cf21b32eb1 task #768 2013-03-16 09:46:34 +01:00
fhenry
98cc7b7a2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-16 09:43:57 +01:00
fhenry
1f5ebb594a [ task #769 ] WYSIWYG for user signature 2013-03-16 09:43:09 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
9a57431879 Show extrafield separator on thirdparty and contact 2013-03-16 00:28:45 +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
jfefe
ba0963ea7d Fix : implement separator extrafield - missing check on update 2013-03-16 00:00:57 +01:00
jfefe
7a16e1b658 Show extrafield separator in propale 2013-03-15 23:41:24 +01:00
jfefe
b36b776f10 IKM : work on new extrafield separator type 2013-03-15 23:39:18 +01:00
Grand Philippe
6fbb00a890 prepair numbering models for supplier invoices 2013-03-15 19:28:26 +01:00
Grand Philippe
7dbc782d42 prepair numbering models for supplier invoices 2013-03-15 19:03:07 +01:00
jfefe
b1d50e3f7f Move extrafield type select list on top of form 2013-03-15 18:56:44 +01:00
jfefe
654e99df8c Work on new type of extrafield : separator with no field stored in database 2013-03-15 18:56:10 +01:00