lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,496 Commits 43 Branches 150 Tags 886 MiB
62ae75b3bf
Commit Graph

45496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
accett
62ae75b3bf Update for Mexico Users 
Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.
 2015-01-26 14:38:02 -06:00
Laurent Destailleur
dfc0ab7bfb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-25 22:00:59 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
Laurent Destailleur
0647c49067 Merge pull request #2274 from aschio/develop 
New: Added Extrafields for Supplier invoice lines and Supplier order lines
 2015-01-25 19:21:03 +01:00
Laurent Destailleur
ffb3af4b23 Merge pull request #2279 from GPCsolutions/readme 
Updated and revamped readme
 2015-01-25 18:15:00 +01:00
Laurent Destailleur
e94d11ecf9 Merge pull request #2278 from GPCsolutions/contributing 
Added contributing guidelines.
 2015-01-25 18:00:38 +01:00
Laurent Destailleur
e49b8f9cbd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-25 11:40:11 +01:00
Laurent Destailleur
c7d5a45780 Prepare test for pgsql 2015-01-25 11:39:48 +01:00
Laurent Destailleur
267ba24820 Generalize option PROJECT_SHOW_REF_INTO_LISTS 2015-01-24 21:41:40 +01:00
Raphaël Doursenaud
11179e5537 Updated and revamped readme 2015-01-23 16:12:59 +01:00
Raphaël Doursenaud
b862e28d5b Added contributing guidelines. 
See: https://github.com/blog/1184-contributing-guidelines
 2015-01-23 15:07:51 +01:00
Laurent Destailleur
71a8f97c89 Optimize code 2015-01-23 02:11:10 +01:00
Laurent Destailleur
0ca1647e11 Fixed: Removed bad commited dir 2015-01-23 01:52:56 +01:00
Laurent Destailleur
4aa4f5f5e9 Merge remote-tracking branch 'origin_dolibarr/develop' into develop 2015-01-22 23:14:40 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6 Fixed travis errors 2015-01-22 21:46:22 +01:00
Laurent Destailleur
eedca43cc3 New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines 
into refering project view.
 2015-01-22 21:31:00 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac Fix: select if field is null 2015-01-22 20:09:57 +01:00
Laurent Destailleur
c4782f960c Qual: Removed not cleand function 2015-01-22 19:47:53 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2015-01-22 18:55:26 +01:00
Laurent Destailleur
639d582a44 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 18:44:21 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
321e46e596 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-22 18:35:55 +01:00
Laurent Destailleur
5c007e53be Update sample examples 2015-01-22 18:35:02 +01:00
cla
134759ce28 update table name facture_fourn_det_extrafields 2015-01-22 15:02:19 +01:00
cla
c8480efbef update table name facture fourn det extrafields 2015-01-22 15:01:27 +01:00
cla
c953a04687 Added files for Extrafields in Order/Invoice Supplier Line. New files 
sql added in install/mysql folder and 2 new pages to insert extrafields
in admin folder
 2015-01-22 14:18:33 +01:00
cla
6dfd5b1fac Added extrafields features for Supplier Invoice Line and Supplier Order Line 2015-01-22 14:15:34 +01:00
Laurent Destailleur
78e90493ed Merge pull request #2269 from frederic34/tooltip 
Add tooltip in getNomUrl link
 2015-01-22 13:58:20 +01:00
Laurent Destailleur
e31decb3cf Merge pull request #2271 from aspangaro/3.7 
Correct link
 2015-01-22 13:57:30 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
frederic34
12c8d4ba1f Merge remote branch 'upstream/develop' into tooltip 2015-01-22 00:44:50 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
Emmanuel Haguet
296d947bd2 Corrections (fichier, calcul de ref) 2015-01-21 16:25:13 +01:00
Emmanuel Haguet
0b3aebeac0 renommage data.csv, User dolibarr et 2ème script 2015-01-21 15:06:32 +01:00
Laurent Destailleur
017a483eb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-21 00:06:03 +01:00
Laurent Destailleur
59ef42cd52 Merge branch 'marcosgdf-delay-emailing' into develop 2015-01-21 00:05:36 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00
Laurent Destailleur
da75877caa Merge pull request #2264 from frederic34/patch-2 
Use getNomUrl on every list to uniformize display
 2015-01-21 00:03:21 +01:00
Laurent Destailleur
25194c4caf Merge pull request #2268 from frederic34/patch-4 
Type of supplier invoice was broken
 2015-01-21 00:02:23 +01:00
Laurent Destailleur
9f00f5d525 Merge pull request #2265 from frederic34/patch-3 
Use css badge
 2015-01-21 00:00:32 +01:00
Laurent Destailleur
3af67b414e Merge pull request #2267 from tiaris/3.6 
add left joins on llx_c_actioncomm
 2015-01-21 00:00:00 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Frédéric FRANCE
3ab6ac601e Type of supplier invoice was broken 2015-01-20 17:55:20 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00