lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85,340 Commits 43 Branches 150 Tags 886 MiB
044a6192b6
Commit Graph

4512 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
f3d35b5a19 Fix phpcs 2020-04-02 17:06:57 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
 2020-04-02 16:49:37 +02:00
Laurent Destailleur
e8fa0ec50c
Merge pull request #13467 from Je2fb/develop 
Update card.php
 2020-04-02 13:30:40 +02:00
Florian Mortgat
f52af23396 NEW: "author" column in the client/supplier invoice lists 2020-04-01 17:09:01 +02:00
Je2fb
fa32618fe9
Update card.php 
If rate change is modify, the currency price is taken in place of the price from the main currency
 2020-03-31 18:58:59 +02:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
Laurent Destailleur
0b7b97ec34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-03-30 19:42:53 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
0ec35793ee
Merge pull request #13433 from ptibogxiv/patch-315 
NEW filter by product on supplier order API
 2020-03-30 19:12:29 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order 
let's get the next replenishment date and order's informations on front-end for selected products
 2020-03-27 15:30:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
 2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
 2020-03-25 19:01:56 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38 
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
 2020-03-22 20:32:15 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
Laurent Destailleur
425d2afc4b Rename js into js.php. Fix some labels 2020-03-22 12:31:27 +01:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6 Fix look and feel v11 2020-03-13 16:52:00 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
stickler-ci
0babab2824 Fixing style errors. 2020-03-12 11:48:08 +00:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
simicar29
325d635c48
Load line extrafields when fetching supplier invoice 
PR to load extrafield values of lines when fetchinf supplier invoice.
 2020-03-12 12:43:06 +01:00
Laurent Destailleur
fc05e8d768 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/other.lang
 2020-03-11 18:03:15 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-03-11 17:04:28 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-03-11 16:44:03 +01:00
Laurent Destailleur
c8bbaa07fd FIX Look and feel v11 2020-03-11 15:53:08 +01:00
atm-lena
20aa51f26b FIX - Clone Fourn Command, add line's extrafields Part 2 2020-03-11 15:26:49 +01:00
atm-lena
35f32391a0 FIX - Clone Fourn Command, add line's extrafields 2020-03-10 14:46:15 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2020-03-04 19:28:15 +01:00
Laurent Destailleur
ddc0547eda Fix position of button 2020-03-04 13:31:19 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency 
NEW: add multicurrency columns to document lists
 2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00