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

62587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6bd0550bdd Remove rowid into script. Must use the autoincrement. 2017-10-22 02:58:31 +02:00
Laurent Destailleur
76d0549682 Merge pull request #7668 from simnandez/develop 
NEW: Add Chile accounting plan
 2017-10-22 02:53:35 +02:00
Laurent Destailleur
9c59b63343 Merge pull request #7667 from mistraloz/patch-1 
Fix Error Column 'date_m' cannot be null
 2017-10-22 02:45:02 +02:00
Laurent Destailleur
fb13419de8 Merge pull request #7665 from dolibarr95/patch-26 
Fix: missing logo in SQL and $companystatic
 2017-10-22 02:43:19 +02:00
Laurent Destailleur
605c9c45e4 Merge pull request #7656 from atm-maxime/fix_accounting_mode 
Fix #7584
 2017-10-22 02:21:53 +02:00
Laurent Destailleur
4c58e4f98a Update compta.php 2017-10-22 02:21:34 +02:00
Laurent Destailleur
210fb5206c Update index.php 2017-10-22 02:21:04 +02:00
Laurent Destailleur
f4db4373ea Update defaultaccounts.php 2017-10-22 02:20:29 +02:00
Laurent Destailleur
728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
 2017-10-22 01:43:33 +02:00
Laurent Destailleur
1afbf75cbc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/index.php
 2017-10-22 01:30:25 +02:00
Laurent Destailleur
da8fe06301 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-22 01:26:17 +02:00
Laurent Destailleur
cad44ee68a FIX substitution in ODT of thirdparties documents 2017-10-22 01:25:59 +02:00
Laurent Destailleur
99b88265d3 Fix larger select2 combo 2017-10-21 21:05:00 +02:00
Laurent Destailleur
475db3172a NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
Laurent Destailleur
dbcf3ddbe8 NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
Juanjo Menent
b8c2c1a907 Merge remote-tracking branch 'upstream/develop' into develop 2017-10-21 14:58:52 +02:00
Laurent Destailleur
270bd13f55 FIX Error when adding a bookmark after using an external GET bookmark 2017-10-21 14:52:58 +02:00
Laurent Destailleur
1426737a26 Work on website 2017-10-21 12:26:14 +02:00
Laurent Destailleur
e74aae18eb CSS 2017-10-21 12:25:51 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00
Juanjo Menent
f18980a209 NEW: Add Chile accounting plan 2017-10-20 19:02:04 +02:00
Juanjo Menent
c54d1eee1c Merge remote-tracking branch 'upstream/develop' into develop 2017-10-20 19:00:25 +02:00
Laurent Destailleur
0e397b3e81 Work on website module 2017-10-20 18:44:03 +02:00
Laurent Destailleur
ab4f5a3aea Clean code 2017-10-20 18:15:43 +02:00
Laurent Destailleur
985675d680 Clean code 2017-10-20 18:04:46 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
Laurent Destailleur
6165bcdbd0 NEW Can export list of stock movements 2017-10-20 14:52:01 +02:00
Juanjo Menent
47b1cf5a91 NEW: Add Chile accounting plan 2017-10-20 11:55:47 +02:00
mistraloz
649d958204 Fix Error Column 'date_m' cannot be null 
Dans un document (facture, devis, ...), dans l'onglet document, si on s'y rend alors que le document n'existe pas encore, il est créé en base. 
Pour une raison que je ne comprends pas bien, date_m est inseré en base s'il est défini et différent de 0, or il est initialisé à '' (vide). Il est donc inseré et non conforme au MCD. 

Faut d'avoir l'historique sur l'évolution de ce module, j'ai trouvé plus simple d'initialiser date_m à la date actuelle lors de sa création. A voir si c'est ou non la meilleure solution.
 2017-10-20 11:48:20 +02:00
Juanjo Menent
6137a17fa6 NEW: Add Chile accounting plan 2017-10-20 10:56:58 +02:00
dolibarr95
03eb69172e logo 
Add logo in sql and in $companystatic in order to load the picture in getNomUrl.
 2017-10-20 09:17:18 +02:00
Laurent Destailleur
5b70468cac Better translation 2017-10-20 04:25:49 +02:00
Laurent Destailleur
a16f0e4356 NEW The gantt diagram is now sensitive to hours 
NEW Add a group task line for tasks on same level on gantt diagram
 2017-10-20 04:15:44 +02:00
Laurent Destailleur
daa7847ab3 NEW All search boxes are available on smartphone 2017-10-20 01:18:21 +02:00
Laurent Destailleur
34d933af29 Default value for graph widget show all graphs 2017-10-20 00:27:52 +02:00
Laurent Destailleur
413807708f Move translation key into main file 2017-10-19 20:59:36 +02:00
Laurent Destailleur
d82af57b57 NEW Add tab "Expense report" on user card 2017-10-19 20:56:23 +02:00
Laurent Destailleur
abd5251330 Better responsive 2017-10-19 19:53:29 +02:00
Laurent Destailleur
5e2d6620f2 Merge pull request #7655 from atm-maxime/new_eldy_sticky_menu 
NEW option to fix top menu with eldy theme (hidden conf)
 2017-10-19 19:29:07 +02:00
Laurent Destailleur
a1217d61b6 Merge pull request #7654 from simnandez/6.0 
FIX: Bad localtax apply
 2017-10-19 19:28:02 +02:00
Laurent Destailleur
fbc3be84e3 Merge pull request #7643 from atm-maxime/fix_dashboard_stats_links 
Fix dashboard stats links
 2017-10-19 19:26:49 +02:00
Laurent Destailleur
f1a0e13718 Merge pull request #7646 from atm-maxime/new_hrm_detailed_user 
NEW hrm details output on user
 2017-10-19 19:21:29 +02:00
Laurent Destailleur
f67350db72 Merge pull request #7647 from BackrndSource/patch-2 
FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php
 2017-10-19 19:19:21 +02:00
Laurent Destailleur
efaa0b1e2a Merge pull request #7640 from atm-florian/6.0_fixeventiconstatus 
fix : better icon for event status Non applicable
 2017-10-19 19:18:56 +02:00
Laurent Destailleur
1202853001 Fix syntax error 2017-10-19 19:12:00 +02:00
Laurent Destailleur
f7556e7ad2 FIX make of link to other object during creation 2017-10-19 19:06:48 +02:00
Laurent Destailleur
d4ade7b935 FIX API to get object does not return data o flinked objects 2017-10-19 17:57:16 +02:00
Laurent Destailleur
e41dcd173e Sync language 2017-10-19 17:55:24 +02:00
Laurent Destailleur
d7113a3602 Fix init of environment for a dedicated entity in API 2017-10-19 17:32:23 +02:00