Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

9872 Commits

Author SHA1 Message Date
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
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
VESSILLER
350408d2ac Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-16 11:10:41 +01:00
Alexandre SPANGARO
af5444806d Work on reconcilation of accouting account 2020-03-16 06:41:14 +01:00
Laurent Destailleur
2cc68fec26 Update accountancy.lang 2020-03-15 11:13:46 +01:00
Alexandre SPANGARO
789529c0e0 Work on reconciliation of accouting account 2020-03-15 07:55:35 +01:00
Laurent Destailleur
92f4250a02 Fxi trans 2020-03-14 22:22:55 +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
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
880cfd1659 FIX #13332 Add more details on screen and help so it is easier to 
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
 2020-03-13 18:10:00 +01:00
VESSILLER
1268bab958 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-13 17:27:04 +01:00
Laurent Destailleur
a437125962 Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules 
NEW add numbering module for cash desk
 2020-03-13 16:58:27 +01:00
Laurent Destailleur
618d276349 Merge pull request #13335 from FHenry/dev_ldcompta10 
NEW : accounting export LD compta version 10
 2020-03-13 16:55:42 +01:00
Laurent Destailleur
6f636d6d69 NEW Add field author public alias for blog post on website module 2020-03-12 20:50:36 +01:00
Laurent Destailleur
864c903d05 FIX #13294 2020-03-12 18:55:08 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
florian HENRY
310bdf6062 NEW : accounting export LD compta version 10 2020-03-12 11:55:26 +01:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +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
61cb1ec81a Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 
NEW : Allow extrafields on pdf : extend to line desc
 2020-03-11 17:12:14 +01:00
Laurent Destailleur
89a8531140 Merge pull request #13237 from aspangaro/12.0_a18 
NEW: Accountancy - Add mode intra & export for product or service bought
 2020-03-11 17:08:49 +01:00
Laurent Destailleur
8609bf9c9c Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons 
NEW add icon on payment buttons in cash desk
 2020-03-11 17:06:04 +01:00
VESSILLER
fc4a98b29c NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons 2020-03-11 15:36:36 +01:00
Laurent Destailleur
65fbc24b36 Work on migration script 2020-03-11 14:53:06 +01:00
Laurent Destailleur
406c333849 Fix trans 2020-03-11 13:55:57 +01:00
Laurent Destailleur
26fec2f366 Enhance website 2020-03-11 12:53:41 +01:00
Laurent Destailleur
d6966dd429 Add method to count number of blogs in website 2020-03-10 15:59:48 +01:00
Laurent Destailleur
078112c649 Fix trans 2020-03-10 15:19:24 +01:00
Laurent Destailleur
788692f964 Trans 2020-03-09 09:19:47 +01:00
Laurent Destailleur
6203e042b1 Trans 2020-03-09 09:10:06 +01:00
Laurent Destailleur
d812249047 Move code into functions 2020-03-06 17:13:51 +01:00
Laurent Destailleur
52c236570b Work on the generic Graphic Reporting tool 2020-03-06 01:18:35 +01:00
Laurent Destailleur
92d6661483 Fix trans 2020-03-05 21:59:44 +01:00
Christian Foellmann
b0f1af8433 add missing translation string "Usage" (projects) 2020-03-04 15:18:50 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
71f19b4e5e FIX #13267 2020-03-04 00:38:04 +01:00
javierybar
e024ea2647 Update cashdesk.lang 2020-03-01 19:45:18 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621 Merge pull request #13227 from aspangaro/12.0_a16 
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
 2020-02-29 13:02:43 +01:00
Laurent Destailleur
56704e4029 Add stats of products in MO 2020-02-28 19:26:52 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
8445c1d814 Merge pull request #13199 from dolibit-ut/patch-2 
Update HOWTO-Translation.txt
 2020-02-26 05:12:44 +01:00
Laurent Destailleur
cb9637e38d Doc 2020-02-25 15:04:56 +01:00
Laurent Destailleur
2c6e7f2917 Tooltip for example on IP restrictions 2020-02-25 13:40:19 +01:00
Laurent Destailleur
dbe770a24f Trans 2020-02-25 13:07:39 +01:00
UT from dolibit
376e19f621 Update HOWTO-Translation.txt 2020-02-25 13:05:23 +01:00
Laurent Destailleur
6c4d782a81 Trans 2020-02-25 12:48:22 +01:00
VESSILLER
73da62d842 NEW Add product on key "Enter" in search bar 2020-02-24 13:57:36 +01:00
John Botella
98407347e7 Update extrafield printable desc 2020-02-24 13:44:26 +01:00