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

46051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d10e28db36 Merge pull request #2326 from aaujon/3.6-webservice-order 
FIXES Webservice : fk_delivery_address not saved
 2015-02-07 23:49:31 +01:00
Laurent Destailleur
6eb0d34032 Merge pull request #2325 from aaujon/3.6-webservices-contact 
FIXED #1824 Add ref_ext for Contact webservices
 2015-02-07 23:47:19 +01:00
Laurent Destailleur
aac584afda Merge pull request #2320 from defrance69/patch-46 
Update paiement.class.php
 2015-02-07 23:46:40 +01:00
Laurent Destailleur
505f194689 Merge pull request #2319 from defrance69/patch-45 
Update 3.6.0-3.7.0.sql
 2015-02-07 23:46:12 +01:00
Alexis Algoud
0ca6661e69 FIX empty discount where created if amount is null for a line with a different tva 2015-02-07 23:42:35 +01:00
Laurent Destailleur
1314d9ce4e Merge pull request #2311 from marcosgdf/bug-1810 
Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7
 2015-02-07 23:41:48 +01:00
Laurent Destailleur
ef31ca9b84 New: Add balance of each account statement. 2015-02-07 23:32:46 +01:00
Florian HENRY
eea4815312 Display amount of line not total amount 2015-02-07 20:58:18 +01:00
Florian HENRY
9a7a5b9b20 review product stats list 2015-02-07 20:36:16 +01:00
Laurent Destailleur
e42290cb88 Update doc 2015-02-07 19:35:00 +01:00
Laurent Destailleur
1d1b3da182 Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:30:28 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
Laurent Destailleur
90fdc29d5e Fix restore compatibility 2015-02-07 17:41:20 +01:00
aspangaro
63dd237b85 Typo 2015-02-07 15:21:30 +01:00
aspangaro
f23212eb22 Center title column & modify language key 2015-02-07 14:55:56 +01:00
aspangaro
ace524056e Same problem 2015-02-07 14:34:04 +01:00
aspangaro
ba78b4c5e9 FIXED Missing language file 2015-02-07 14:18:02 +01:00
Christophe Battarel
3940abe7c1 FIX: select DISTINCT for natural search on proposal list (in the same 
way it's done in invoices list)
 2015-02-07 10:48:03 +01:00
aspangaro
71b9098a44 Fix : Typo on merge 2015-02-07 06:42:36 +01:00
Laurent Destailleur
3bdf8864a9 New: Add option MAXTABS_IN_CARD to limit number of visible tabs. 2015-02-07 04:24:31 +01:00
Laurent Destailleur
c5269eb0a5 Fix: back to project page 2015-02-07 04:06:38 +01:00
Laurent Destailleur
7cc9a09f99 Fix bad order 2015-02-07 04:06:30 +01:00
Laurent Destailleur
4a3e4d6ec9 Fix: back to project page 2015-02-07 04:04:56 +01:00
Laurent Destailleur
2c364dbe8c Fix filter on status 2015-02-07 03:54:00 +01:00
Laurent Destailleur
a21acdeb7c Enable select2 for users combo 2015-02-07 03:41:09 +01:00
Laurent Destailleur
7738478564 Fix bad order 2015-02-07 03:29:33 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
d812b2b7b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-07 03:12:21 +01:00
Laurent Destailleur
2f388949f6 Make a test with jsganttimproved 2015-02-07 03:11:35 +01:00
Laurent Destailleur
ba5d355eb3 Fix bad property 2015-02-07 02:14:45 +01:00
Laurent Destailleur
53453a63f5 Fix: pb when posting page due to apache limit 2015-02-07 01:45:09 +01:00
Laurent Destailleur
79ac620ab5 Fix label of status 2015-02-07 01:32:21 +01:00
Juanjo Menent
9d57f5b957 Trad: update es_ES from Transifex 2015-02-06 22:55:43 +01:00
Laurent Destailleur
553181a5d9 Fixed: Location for file storage from tab attached files was not at same 
place than from tab images.
 2015-02-06 21:26:41 +01:00
phf
1d9a3e0ce2 [CORE] Fix : renommage d'une fonction (#deliverytime). 2015-02-06 16:39:54 +01:00
phf
0e74dd4b95 [CORE] ajout de la colonne "delivery_time_days" en bdd (#deliverytime). 2015-02-06 16:35:19 +01:00
phf
12c7e52b7e [CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime). 2015-02-06 16:33:58 +01:00
Laurent Destailleur
35129f2192 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly 
supported.
Fix: No limit on ldap search on dolibarr side.
 2015-02-06 16:33:33 +01:00
phf
35d41d6f7c [CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime). 2015-02-06 16:07:22 +01:00
Marcos García de La Fuente
b8b9df7b95 Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes 2015-02-06 12:36:09 +01:00
Arnaud Aujon
65efa7ddf7 FIXED #1824 Add ref_ext for Contact webservices 
Add possibility to use ref_ext to reference contact using webservice, field was present but not saved and not used to fetch object
 2015-02-05 14:28:16 +01:00
Arnaud Aujon Chevallier
eb2c5c29b7 FIXES Webservice : fk_delivery_address not saved 2015-02-05 13:33:58 +01:00
Laurent Destailleur
4c5fa7510c Fix bad translation key 2015-02-05 12:06:20 +01:00
Laurent Destailleur
b654ffb627 New: Add option SUPPLIER_ORDER_HIDE_VALIDATED. So a module can remove 
this step. Useless when all users have permission to approve supplier
orers.
 2015-02-05 11:58:40 +01:00
Laurent Destailleur
7d64d3d17b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-05 11:53:50 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
 2015-02-04 15:15:50 +01:00
BENKE Charles
50ff9d2d0c Update paiement.class.php 
in case of sql query add error message in log instead of the screen
 2015-02-04 02:17:37 +01:00
BENKE Charles
79818e8693 Update 3.6.0-3.7.0.sql 
update url in llx_bank_url for remplacement of fiche.php by card.php
Need to made it on 3.7 branch urgently
 2015-02-04 00:45:52 +01:00
Laurent Destailleur
4477a712d6 Fix: calendar was not using option START_WEEK. 2015-02-03 14:02:36 +01:00
Laurent Destailleur
a6e4fdd7c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-03 14:02:07 +01:00